diff --git a/Valentina.pro b/Valentina.pro index 54d3e0c11..79ddb9f73 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -1,4 +1,4 @@ -include(Valentina.pri) +include(common.pri) #Check if Qt version >= 5.0.0 !minQtVersion(5, 0, 0) { diff --git a/Valentina.pri b/common.pri similarity index 100% rename from Valentina.pri rename to common.pri diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index f8e285b68..64988c7a9 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -7,7 +7,7 @@ # Compilation main binary file # 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 # library in installer. @@ -61,7 +61,7 @@ OTHER_FILES += \ share/resources/valentina.rc \ # For Windows system. 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 { CONFIG(debug, debug|release){ $$enable_ccache()# Use only in debug mode on Mac @@ -70,7 +70,7 @@ macx { $$enable_ccache() } -# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +# Set precompiled headers. Function set_PCH() defined in common.pri. $$set_PCH() CONFIG(debug, debug|release){ @@ -84,7 +84,7 @@ CONFIG(debug, debug|release){ -isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${RCC_DIR}" \ -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 # do nothing @@ -103,7 +103,7 @@ CONFIG(debug, debug|release){ -isystem "$${OUT_PWD}/$${MOC_DIR}" \ -isystem "$${OUT_PWD}/$${RCC_DIR}" \ -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 # want them in global list. Compromise decision delete them from local list. @@ -113,7 +113,7 @@ CONFIG(debug, debug|release){ } } else { *-g++{ - QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. } } diff --git a/src/libs/ifc/ifc.pro b/src/libs/ifc/ifc.pro index b0adbb445..21f8c352c 100644 --- a/src/libs/ifc/ifc.pro +++ b/src/libs/ifc/ifc.pro @@ -5,7 +5,7 @@ #------------------------------------------------- # File with common stuff for whole project -include(../../../Valentina.pri) +include(../../../common.pri) # Library work with xml. QT += xml xmlpatterns printsupport @@ -47,10 +47,10 @@ OBJECTS_DIR = obj RESOURCES += \ 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() -# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +# Set precompiled headers. Function set_PCH() defined in common.pri. $$set_PCH() CONFIG(debug, debug|release){ @@ -61,7 +61,7 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -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 # do nothing @@ -77,7 +77,7 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -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 # want them in global list. Compromise decision delete them from local list. @@ -86,7 +86,7 @@ CONFIG(debug, debug|release){ } } else { *-g++{ - QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. } } diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index 62994578c..abaf9ab39 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -5,7 +5,7 @@ #------------------------------------------------- # File with common stuff for whole project -include(../../../Valentina.pri) +include(../../../common.pri) # We don't need gui library. QT -= gui @@ -59,10 +59,10 @@ unix:!macx{ INSTALLS += target } -# Set using ccache. Function enable_ccache() defined in Valentina.pri. +# Set using ccache. Function enable_ccache() defined in common.pri. $$enable_ccache() -# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +# Set precompiled headers. Function set_PCH() defined in common.pri. $$set_PCH() CONFIG(debug, debug|release){ @@ -73,7 +73,7 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -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 # do nothing @@ -89,11 +89,11 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - $$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. + $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details. } } else { *-g++{ - QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. } } diff --git a/src/libs/vgeometry/vgeometry.pro b/src/libs/vgeometry/vgeometry.pro index 6676a3fda..152ad9d4d 100644 --- a/src/libs/vgeometry/vgeometry.pro +++ b/src/libs/vgeometry/vgeometry.pro @@ -5,7 +5,7 @@ #------------------------------------------------- # File with common stuff for whole project -include(../../../Valentina.pri) +include(../../../common.pri) # Name of library TARGET = vgeometry @@ -37,10 +37,10 @@ MOC_DIR = moc # objecs files 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() -# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +# Set precompiled headers. Function set_PCH() defined in common.pri. $$set_PCH() CONFIG(debug, debug|release){ @@ -51,7 +51,7 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -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 # do nothing @@ -67,11 +67,11 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - $$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. + $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details. } } else { *-g++{ - QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. } } diff --git a/src/libs/vlayout/vlayout.pro b/src/libs/vlayout/vlayout.pro index 2d45800a7..fd434337f 100644 --- a/src/libs/vlayout/vlayout.pro +++ b/src/libs/vlayout/vlayout.pro @@ -5,7 +5,7 @@ #------------------------------------------------- # File with common stuff for whole project -include(../../../Valentina.pri) +include(../../../common.pri) QT += core gui widgets printsupport @@ -39,10 +39,10 @@ MOC_DIR = moc # objecs files 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() -# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +# Set precompiled headers. Function set_PCH() defined in common.pri. $$set_PCH() CONFIG(debug, debug|release){ @@ -53,7 +53,7 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -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 # do nothing @@ -69,7 +69,7 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -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 # want them in global list. Compromise decision delete them from local list. @@ -78,7 +78,7 @@ CONFIG(debug, debug|release){ } } else { *-g++{ - QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. } } diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro index 6a51731ce..ac78aa553 100644 --- a/src/libs/vmisc/vmisc.pro +++ b/src/libs/vmisc/vmisc.pro @@ -5,7 +5,7 @@ #------------------------------------------------- # File with common stuff for whole project -include(../../../Valentina.pri) +include(../../../common.pri) QT += widgets @@ -39,10 +39,10 @@ MOC_DIR = moc # objecs files 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() -# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +# Set precompiled headers. Function set_PCH() defined in common.pri. $$set_PCH() CONFIG(debug, debug|release){ @@ -53,7 +53,7 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -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 # do nothing @@ -69,7 +69,7 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -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 # want them in global list. Compromise decision delete them from local list. @@ -78,7 +78,7 @@ CONFIG(debug, debug|release){ } } else { *-g++{ - QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. } } diff --git a/src/libs/vobj/vobj.pro b/src/libs/vobj/vobj.pro index f23693def..1705dc77e 100644 --- a/src/libs/vobj/vobj.pro +++ b/src/libs/vobj/vobj.pro @@ -5,7 +5,7 @@ #------------------------------------------------- # File with common stuff for whole project -include(../../../Valentina.pri) +include(../../../common.pri) # Name of library TARGET = vobj @@ -37,10 +37,10 @@ MOC_DIR = moc # objecs files 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() -# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +# Set precompiled headers. Function set_PCH() defined in common.pri. $$set_PCH() CONFIG(debug, debug|release){ @@ -51,7 +51,7 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -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 # do nothing @@ -67,11 +67,11 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - $$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. + $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details. } } else { *-g++{ - QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. } } diff --git a/src/libs/vpatterndb/vpatterndb.pro b/src/libs/vpatterndb/vpatterndb.pro index dffd4f892..9dda3c5c8 100644 --- a/src/libs/vpatterndb/vpatterndb.pro +++ b/src/libs/vpatterndb/vpatterndb.pro @@ -5,7 +5,7 @@ #------------------------------------------------- # File with common stuff for whole project -include(../../../Valentina.pri) +include(../../../common.pri) QT += widgets @@ -39,10 +39,10 @@ MOC_DIR = moc # objecs files 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() -# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +# Set precompiled headers. Function set_PCH() defined in common.pri. $$set_PCH() CONFIG(debug, debug|release){ @@ -53,7 +53,7 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -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 # do nothing @@ -69,11 +69,11 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - $$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. + $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details. } } else { *-g++{ - QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. } } diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index b50ee6a29..f1ab50cb2 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -5,7 +5,7 @@ #------------------------------------------------- # File with common stuff for whole project -include(../../../Valentina.pri) +include(../../../common.pri) # Library use widgets QT += widgets @@ -57,10 +57,10 @@ unix:!macx{ INSTALLS += target } -# Set using ccache. Function enable_ccache() defined in Valentina.pri. +# Set using ccache. Function enable_ccache() defined in common.pri. $$enable_ccache() -# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +# Set precompiled headers. Function set_PCH() defined in common.pri. $$set_PCH() CONFIG(debug, debug|release){ @@ -71,7 +71,7 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \ # 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 # want them in global list. Compromise decision delete them from local list. @@ -93,7 +93,7 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -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 # want them in global list. Compromise decision delete them from local list. @@ -102,7 +102,7 @@ CONFIG(debug, debug|release){ } } else { *-g++{ - QMAKE_CXXFLAGS += $$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details. } } diff --git a/src/libs/vtools/vtools.pro b/src/libs/vtools/vtools.pro index 08af56da6..b81b6903e 100644 --- a/src/libs/vtools/vtools.pro +++ b/src/libs/vtools/vtools.pro @@ -5,7 +5,7 @@ #------------------------------------------------- # File with common stuff for whole project -include(../../../Valentina.pri) +include(../../../common.pri) QT += widgets xml @@ -45,10 +45,10 @@ OBJECTS_DIR = obj # Directory for files created 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() -# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +# Set precompiled headers. Function set_PCH() defined in common.pri. $$set_PCH() INCLUDEPATH += $$PWD/../vpatterndb @@ -63,7 +63,7 @@ CONFIG(debug, debug|release){ -isystem "$${OUT_PWD}/$${UI_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_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 # do nothing @@ -79,11 +79,11 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - $$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. + $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details. } } else { *-g++{ - QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. } } diff --git a/src/libs/vwidgets/vwidgets.pro b/src/libs/vwidgets/vwidgets.pro index ad7a64b08..9ccd5f73d 100644 --- a/src/libs/vwidgets/vwidgets.pro +++ b/src/libs/vwidgets/vwidgets.pro @@ -5,7 +5,7 @@ #------------------------------------------------- # File with common stuff for whole project -include(../../../Valentina.pri) +include(../../../common.pri) QT += widgets @@ -39,10 +39,10 @@ MOC_DIR = moc # objecs files 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() -# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +# Set precompiled headers. Function set_PCH() defined in common.pri. $$set_PCH() CONFIG(debug, debug|release){ @@ -53,7 +53,7 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -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 # do nothing @@ -69,11 +69,11 @@ CONFIG(debug, debug|release){ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ - $$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details. + $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details. } } else { *-g++{ - QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. } } diff --git a/src/test/ParserTest/ParserTest.pro b/src/test/ParserTest/ParserTest.pro index fb67664cd..f7c86af96 100644 --- a/src/test/ParserTest/ParserTest.pro +++ b/src/test/ParserTest/ParserTest.pro @@ -7,7 +7,7 @@ # Build QMuParser tests. # File with common stuff for whole project -include(../../../Valentina.pri) +include(../../../common.pri) # We use many core functions. QT += core @@ -40,10 +40,10 @@ SOURCES += \ main.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() -# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +# Set precompiled headers. Function set_PCH() defined in common.pri. $$set_PCH() CONFIG(debug, debug|release){ @@ -52,7 +52,7 @@ CONFIG(debug, debug|release){ #Turn on compilers warnings. *-g++{ 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 # do nothing @@ -66,7 +66,7 @@ CONFIG(debug, debug|release){ } clang*{ 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 # want them in global list. Compromise decision delete them from local list. @@ -75,7 +75,7 @@ CONFIG(debug, debug|release){ } } else { *-g++{ - QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. } } diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index a8d6a301b..2678849d2 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -9,7 +9,7 @@ QT += testlib gui printsupport TARGET = ValentinaTests # 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 # adds a 'make install' that installs the test cases, which we do not want. @@ -54,10 +54,10 @@ HEADERS += \ tst_varc.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() -# Set precompiled headers. Function set_PCH() defined in Valentina.pri. +# Set precompiled headers. Function set_PCH() defined in common.pri. $$set_PCH() CONFIG(debug, debug|release){ @@ -70,7 +70,7 @@ CONFIG(debug, debug|release){ -isystem "$${OUT_PWD}/$${UI_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_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 # do nothing @@ -88,11 +88,11 @@ CONFIG(debug, debug|release){ -isystem "$${OUT_PWD}/$${UI_DIR}" \ -isystem "$${OUT_PWD}/$${MOC_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 { *-g++{ - QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details. + QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. } } }else{