aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename ambiguous Valentina.pri.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2015-07-10 12:28:30 +03:00
parent bc8d2af626
commit 77767ed85b
15 changed files with 79 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Valentina.pro
View File

@ -1,4 +1,4 @@
include(Valentina.pri) include(common.pri)
#Check if Qt version >= 5.0.0 #Check if Qt version >= 5.0.0
!minQtVersion(5, 0, 0) { !minQtVersion(5, 0, 0) {

0
Valentina.pri → common.pri
View File

12
src/app/valentina/valentina.pro
View File

@ -7,7 +7,7 @@
# Compilation main binary file # Compilation main binary file
# File with common stuff for whole project # File with common stuff for whole project
include(../../../Valentina.pri) include(../../../common.pri)
# Here we don't see "network" library, but, i think, "printsupport" depend on this library, so we still need this # Here we don't see "network" library, but, i think, "printsupport" depend on this library, so we still need this
# library in installer. # library in installer.
@ -61,7 +61,7 @@ OTHER_FILES += \
share/resources/valentina.rc \ # For Windows system. share/resources/valentina.rc \ # For Windows system.
share/resources/icon/64x64/icon64x64.ico # Valentina's logo. share/resources/icon/64x64/icon64x64.ico # Valentina's logo.
# Set using ccache. Function enable_ccache() defined in Valentina.pri. # Set using ccache. Function enable_ccache() defined in common.pri.
macx { macx {
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
$$enable_ccache()# Use only in debug mode on Mac $$enable_ccache()# Use only in debug mode on Mac
@ -70,7 +70,7 @@ macx {
$$enable_ccache() $$enable_ccache()
} }
# Set precompiled headers. Function set_PCH() defined in Valentina.pri. # Set precompiled headers. Function set_PCH() defined in common.pri.
$$set_PCH() $$set_PCH()
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
@ -84,7 +84,7 @@ CONFIG(debug, debug|release){
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
-isystem "$${OUT_PWD}/$${RCC_DIR}" \ -isystem "$${OUT_PWD}/$${RCC_DIR}" \
-isystem "$${OUT_PWD}/../../libs/vtools/$${UI_DIR}" \ # For VTools UI files -isystem "$${OUT_PWD}/../../libs/vtools/$${UI_DIR}" \ # For VTools UI files
$$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
# do nothing # do nothing
@ -103,7 +103,7 @@ CONFIG(debug, debug|release){
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
-isystem "$${OUT_PWD}/$${RCC_DIR}" \ -isystem "$${OUT_PWD}/$${RCC_DIR}" \
-isystem "$${OUT_PWD}/../../libs/vtools/$${UI_DIR}" \ # For VTools UI files -isystem "$${OUT_PWD}/../../libs/vtools/$${UI_DIR}" \ # For VTools UI files
$$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
# -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and # -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and
# want them in global list. Compromise decision delete them from local list. # want them in global list. Compromise decision delete them from local list.
@ -113,7 +113,7 @@ CONFIG(debug, debug|release){
} }
} else { } else {
*-g++{ *-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} }

12
src/libs/ifc/ifc.pro
View File

@ -5,7 +5,7 @@
#------------------------------------------------- #-------------------------------------------------
# File with common stuff for whole project # File with common stuff for whole project
include(../../../Valentina.pri) include(../../../common.pri)
# Library work with xml. # Library work with xml.
QT += xml xmlpatterns printsupport QT += xml xmlpatterns printsupport
@ -47,10 +47,10 @@ OBJECTS_DIR = obj
RESOURCES += \ RESOURCES += \
schema.qrc # Schemas for validation xml files. schema.qrc # Schemas for validation xml files.
# Set using ccache. Function enable_ccache() defined in Valentina.pri. # Set using ccache. Function enable_ccache() defined in common.pri.
$$enable_ccache() $$enable_ccache()
# Set precompiled headers. Function set_PCH() defined in Valentina.pri. # Set precompiled headers. Function set_PCH() defined in common.pri.
$$set_PCH() $$set_PCH()
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
@ -61,7 +61,7 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
# do nothing # do nothing
@ -77,7 +77,7 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
# -isystem key works only for headers. In some cases it's not enough. But we can't delete these warnings and # -isystem key works only for headers. In some cases it's not enough. But we can't delete these warnings and
# want them in global list. Compromise decision delete them from local list. # want them in global list. Compromise decision delete them from local list.
@ -86,7 +86,7 @@ CONFIG(debug, debug|release){
} }
} else { } else {
*-g++{ *-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} }

12
src/libs/qmuparser/qmuparser.pro
View File

@ -5,7 +5,7 @@
#------------------------------------------------- #-------------------------------------------------
# File with common stuff for whole project # File with common stuff for whole project
include(../../../Valentina.pri) include(../../../common.pri)
# We don't need gui library. # We don't need gui library.
QT -= gui QT -= gui
@ -59,10 +59,10 @@ unix:!macx{
INSTALLS += target INSTALLS += target
} }
# Set using ccache. Function enable_ccache() defined in Valentina.pri. # Set using ccache. Function enable_ccache() defined in common.pri.
$$enable_ccache() $$enable_ccache()
# Set precompiled headers. Function set_PCH() defined in Valentina.pri. # Set precompiled headers. Function set_PCH() defined in common.pri.
$$set_PCH() $$set_PCH()
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
@ -73,7 +73,7 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
# do nothing # do nothing
@ -89,11 +89,11 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} else { } else {
*-g++{ *-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} }

12
src/libs/vgeometry/vgeometry.pro
View File

@ -5,7 +5,7 @@
#------------------------------------------------- #-------------------------------------------------
# File with common stuff for whole project # File with common stuff for whole project
include(../../../Valentina.pri) include(../../../common.pri)
# Name of library # Name of library
TARGET = vgeometry TARGET = vgeometry
@ -37,10 +37,10 @@ MOC_DIR = moc
# objecs files # objecs files
OBJECTS_DIR = obj OBJECTS_DIR = obj
# Set using ccache. Function enable_ccache() defined in Valentina.pri. # Set using ccache. Function enable_ccache() defined in common.pri.
$$enable_ccache() $$enable_ccache()
# Set precompiled headers. Function set_PCH() defined in Valentina.pri. # Set precompiled headers. Function set_PCH() defined in common.pri.
$$set_PCH() $$set_PCH()
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
@ -51,7 +51,7 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
# do nothing # do nothing
@ -67,11 +67,11 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} else { } else {
*-g++{ *-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} }

12
src/libs/vlayout/vlayout.pro
View File

@ -5,7 +5,7 @@
#------------------------------------------------- #-------------------------------------------------
# File with common stuff for whole project # File with common stuff for whole project
include(../../../Valentina.pri) include(../../../common.pri)
QT += core gui widgets printsupport QT += core gui widgets printsupport
@ -39,10 +39,10 @@ MOC_DIR = moc
# objecs files # objecs files
OBJECTS_DIR = obj OBJECTS_DIR = obj
# Set using ccache. Function enable_ccache() defined in Valentina.pri. # Set using ccache. Function enable_ccache() defined in common.pri.
$$enable_ccache() $$enable_ccache()
# Set precompiled headers. Function set_PCH() defined in Valentina.pri. # Set precompiled headers. Function set_PCH() defined in common.pri.
$$set_PCH() $$set_PCH()
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
@ -53,7 +53,7 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
# do nothing # do nothing
@ -69,7 +69,7 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
# -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and # -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and
# want them in global list. Compromise decision delete them from local list. # want them in global list. Compromise decision delete them from local list.
@ -78,7 +78,7 @@ CONFIG(debug, debug|release){
} }
} else { } else {
*-g++{ *-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} }

12
src/libs/vmisc/vmisc.pro
View File

@ -5,7 +5,7 @@
#------------------------------------------------- #-------------------------------------------------
# File with common stuff for whole project # File with common stuff for whole project
include(../../../Valentina.pri) include(../../../common.pri)
QT += widgets QT += widgets
@ -39,10 +39,10 @@ MOC_DIR = moc
# objecs files # objecs files
OBJECTS_DIR = obj OBJECTS_DIR = obj
# Set using ccache. Function enable_ccache() defined in Valentina.pri. # Set using ccache. Function enable_ccache() defined in common.pri.
$$enable_ccache() $$enable_ccache()
# Set precompiled headers. Function set_PCH() defined in Valentina.pri. # Set precompiled headers. Function set_PCH() defined in common.pri.
$$set_PCH() $$set_PCH()
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
@ -53,7 +53,7 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
# do nothing # do nothing
@ -69,7 +69,7 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
# -isystem key works only for headers. In some cases it's not enough. But we can't delete these warnings and # -isystem key works only for headers. In some cases it's not enough. But we can't delete these warnings and
# want them in global list. Compromise decision delete them from local list. # want them in global list. Compromise decision delete them from local list.
@ -78,7 +78,7 @@ CONFIG(debug, debug|release){
} }
} else { } else {
*-g++{ *-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} }

12
src/libs/vobj/vobj.pro
View File

@ -5,7 +5,7 @@
#------------------------------------------------- #-------------------------------------------------
# File with common stuff for whole project # File with common stuff for whole project
include(../../../Valentina.pri) include(../../../common.pri)
# Name of library # Name of library
TARGET = vobj TARGET = vobj
@ -37,10 +37,10 @@ MOC_DIR = moc
# objecs files # objecs files
OBJECTS_DIR = obj OBJECTS_DIR = obj
# Set using ccache. Function enable_ccache() defined in Valentina.pri. # Set using ccache. Function enable_ccache() defined in common.pri.
$$enable_ccache() $$enable_ccache()
# Set precompiled headers. Function set_PCH() defined in Valentina.pri. # Set precompiled headers. Function set_PCH() defined in common.pri.
$$set_PCH() $$set_PCH()
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
@ -51,7 +51,7 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
# do nothing # do nothing
@ -67,11 +67,11 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} else { } else {
*-g++{ *-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} }

12
src/libs/vpatterndb/vpatterndb.pro
View File

@ -5,7 +5,7 @@
#------------------------------------------------- #-------------------------------------------------
# File with common stuff for whole project # File with common stuff for whole project
include(../../../Valentina.pri) include(../../../common.pri)
QT += widgets QT += widgets
@ -39,10 +39,10 @@ MOC_DIR = moc
# objecs files # objecs files
OBJECTS_DIR = obj OBJECTS_DIR = obj
# Set using ccache. Function enable_ccache() defined in Valentina.pri. # Set using ccache. Function enable_ccache() defined in common.pri.
$$enable_ccache() $$enable_ccache()
# Set precompiled headers. Function set_PCH() defined in Valentina.pri. # Set precompiled headers. Function set_PCH() defined in common.pri.
$$set_PCH() $$set_PCH()
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
@ -53,7 +53,7 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
# do nothing # do nothing
@ -69,11 +69,11 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} else { } else {
*-g++{ *-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} }

12
src/libs/vpropertyexplorer/vpropertyexplorer.pro
View File

@ -5,7 +5,7 @@
#------------------------------------------------- #-------------------------------------------------
# File with common stuff for whole project # File with common stuff for whole project
include(../../../Valentina.pri) include(../../../common.pri)
# Library use widgets # Library use widgets
QT += widgets QT += widgets
@ -57,10 +57,10 @@ unix:!macx{
INSTALLS += target INSTALLS += target
} }
# Set using ccache. Function enable_ccache() defined in Valentina.pri. # Set using ccache. Function enable_ccache() defined in common.pri.
$$enable_ccache() $$enable_ccache()
# Set precompiled headers. Function set_PCH() defined in Valentina.pri. # Set precompiled headers. Function set_PCH() defined in common.pri.
$$set_PCH() $$set_PCH()
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
@ -71,7 +71,7 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
$$GCC_DEBUG_CXXFLAGS \ # See Valentina.pri for more details. $$GCC_DEBUG_CXXFLAGS \ # See common.pri for more details.
# -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and # -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and
# want them in global list. Compromise decision delete them from local list. # want them in global list. Compromise decision delete them from local list.
@ -93,7 +93,7 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
# -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and # -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and
# want them in global list. Compromise decision delete them from local list. # want them in global list. Compromise decision delete them from local list.
@ -102,7 +102,7 @@ CONFIG(debug, debug|release){
} }
} else { } else {
*-g++{ *-g++{
QMAKE_CXXFLAGS += $$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. QMAKE_CXXFLAGS += $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} }

12
src/libs/vtools/vtools.pro
View File

@ -5,7 +5,7 @@
#------------------------------------------------- #-------------------------------------------------
# File with common stuff for whole project # File with common stuff for whole project
include(../../../Valentina.pri) include(../../../common.pri)
QT += widgets xml QT += widgets xml
@ -45,10 +45,10 @@ OBJECTS_DIR = obj
# Directory for files created uic # Directory for files created uic
UI_DIR = uic UI_DIR = uic
# Set using ccache. Function enable_ccache() defined in Valentina.pri. # Set using ccache. Function enable_ccache() defined in common.pri.
$$enable_ccache() $$enable_ccache()
# Set precompiled headers. Function set_PCH() defined in Valentina.pri. # Set precompiled headers. Function set_PCH() defined in common.pri.
$$set_PCH() $$set_PCH()
INCLUDEPATH += $$PWD/../vpatterndb INCLUDEPATH += $$PWD/../vpatterndb
@ -63,7 +63,7 @@ CONFIG(debug, debug|release){
-isystem "$${OUT_PWD}/$${UI_DIR}" \ -isystem "$${OUT_PWD}/$${UI_DIR}" \
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
# -isystem "$${OUT_PWD}/$${RCC_DIR}" \ # -isystem "$${OUT_PWD}/$${RCC_DIR}" \
$$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
# do nothing # do nothing
@ -79,11 +79,11 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} else { } else {
*-g++{ *-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} }

12
src/libs/vwidgets/vwidgets.pro
View File

@ -5,7 +5,7 @@
#------------------------------------------------- #-------------------------------------------------
# File with common stuff for whole project # File with common stuff for whole project
include(../../../Valentina.pri) include(../../../common.pri)
QT += widgets QT += widgets
@ -39,10 +39,10 @@ MOC_DIR = moc
# objecs files # objecs files
OBJECTS_DIR = obj OBJECTS_DIR = obj
# Set using ccache. Function enable_ccache() defined in Valentina.pri. # Set using ccache. Function enable_ccache() defined in common.pri.
$$enable_ccache() $$enable_ccache()
# Set precompiled headers. Function set_PCH() defined in Valentina.pri. # Set precompiled headers. Function set_PCH() defined in common.pri.
$$set_PCH() $$set_PCH()
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
@ -53,7 +53,7 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
# do nothing # do nothing
@ -69,11 +69,11 @@ CONFIG(debug, debug|release){
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers. # Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} else { } else {
*-g++{ *-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} }

12
src/test/ParserTest/ParserTest.pro
View File

@ -7,7 +7,7 @@
# Build QMuParser tests. # Build QMuParser tests.
# File with common stuff for whole project # File with common stuff for whole project
include(../../../Valentina.pri) include(../../../common.pri)
# We use many core functions. # We use many core functions.
QT += core QT += core
@ -40,10 +40,10 @@ SOURCES += \
main.cpp \ main.cpp \
stable.cpp stable.cpp
# Set using ccache. Function enable_ccache() defined in Valentina.pri. # Set using ccache. Function enable_ccache() defined in common.pri.
$$enable_ccache() $$enable_ccache()
# Set precompiled headers. Function set_PCH() defined in Valentina.pri. # Set precompiled headers. Function set_PCH() defined in common.pri.
$$set_PCH() $$set_PCH()
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
@ -52,7 +52,7 @@ CONFIG(debug, debug|release){
#Turn on compilers warnings. #Turn on compilers warnings.
*-g++{ *-g++{
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
$$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
# do nothing # do nothing
@ -66,7 +66,7 @@ CONFIG(debug, debug|release){
} }
clang*{ clang*{
QMAKE_CXXFLAGS += \ QMAKE_CXXFLAGS += \
$$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
# -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and # -isystem key works only for headers. In some cases it's not enough. But we can't delete this warnings and
# want them in global list. Compromise decision delete them from local list. # want them in global list. Compromise decision delete them from local list.
@ -75,7 +75,7 @@ CONFIG(debug, debug|release){
} }
} else { } else {
*-g++{ *-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} }

12
src/test/ValentinaTest/ValentinaTest.pro
View File

@ -9,7 +9,7 @@ QT += testlib gui printsupport
TARGET = ValentinaTests TARGET = ValentinaTests
# File with common stuff for whole project # File with common stuff for whole project
include(../../../Valentina.pri) include(../../../common.pri)
# CONFIG += testcase adds a 'make check' which is great. But by default it also # CONFIG += testcase adds a 'make check' which is great. But by default it also
# adds a 'make install' that installs the test cases, which we do not want. # adds a 'make install' that installs the test cases, which we do not want.
@ -54,10 +54,10 @@ HEADERS += \
tst_varc.h \ tst_varc.h \
stable.h stable.h
# Set using ccache. Function enable_ccache() defined in Valentina.pri. # Set using ccache. Function enable_ccache() defined in common.pri.
$$enable_ccache() $$enable_ccache()
# Set precompiled headers. Function set_PCH() defined in Valentina.pri. # Set precompiled headers. Function set_PCH() defined in common.pri.
$$set_PCH() $$set_PCH()
CONFIG(debug, debug|release){ CONFIG(debug, debug|release){
@ -70,7 +70,7 @@ CONFIG(debug, debug|release){
-isystem "$${OUT_PWD}/$${UI_DIR}" \ -isystem "$${OUT_PWD}/$${UI_DIR}" \
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
-isystem "$${OUT_PWD}/$${RCC_DIR}" \ -isystem "$${OUT_PWD}/$${RCC_DIR}" \
$$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
# do nothing # do nothing
@ -88,11 +88,11 @@ CONFIG(debug, debug|release){
-isystem "$${OUT_PWD}/$${UI_DIR}" \ -isystem "$${OUT_PWD}/$${UI_DIR}" \
-isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \
-isystem "$${OUT_PWD}/$${RCC_DIR}" \ -isystem "$${OUT_PWD}/$${RCC_DIR}" \
$$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} else { } else {
*-g++{ *-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
} }
} }
}else{ }else{