From 3c0c62468256e29a227bc2a20d7275ee3566b08d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 26 Dec 2020 19:44:55 +0200 Subject: [PATCH] Don't check warnings for a legacy mac os x build. --- .travis.yml | 6 +++- common.pri | 32 ++++++------------- src/app/tape/tape.pro | 2 +- src/app/valentina/valentina.pro | 3 +- src/libs/fervor/fervor.pro | 2 +- src/libs/ifc/ifc.pro | 2 +- src/libs/qmuparser/qmuparser.pro | 2 +- src/libs/vformat/vformat.pro | 2 +- src/libs/vgeometry/vgeometry.pro | 2 +- src/libs/vlayout/vlayout.pro | 2 +- src/libs/vmisc/vmisc.pro | 2 +- src/libs/vobj/vobj.pro | 2 +- src/libs/vpatterndb/vpatterndb.pro | 2 +- .../vpropertyexplorer/vpropertyexplorer.pro | 2 +- src/libs/vtest/vtest.pro | 2 +- src/libs/vtools/vtools.pro | 2 +- src/libs/vwidgets/vwidgets.pro | 2 +- src/test/CollectionTest/CollectionTest.pro | 2 +- src/test/ParserTest/ParserTest.pro | 2 +- .../TranslationsTest/TranslationsTest.pro | 2 +- src/test/ValentinaTest/ValentinaTest.pro | 2 +- 21 files changed, 34 insertions(+), 43 deletions(-) diff --git a/.travis.yml b/.travis.yml index 002229d15..dda0880d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,7 +105,11 @@ before_script: qmake ../Valentina.pro -r -spec linux-clang CONFIG+=noDebugSymbols CONFIG+=checkWarnings CONFIG+=noTests; fi else - qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=checkWarnings CONFIG+=noTests; + if [[ "$LEGACY" = false ]]; then + qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=checkWarnings CONFIG+=noTests; + else + qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=noTests; + fi fi script: - "$CXX --version" diff --git a/common.pri b/common.pri index 58380693f..6662944ef 100644 --- a/common.pri +++ b/common.pri @@ -329,23 +329,6 @@ defineReplace(FindLatestTagDistance){ # In debug mode on Unix system we use all usefull for us compilers keys for checking errors. # Also trying make all possible for speed up build time. unix { - -!macx{ -# Key -isystem disable checking errors in system headers. Mark ignore warnings Qt headers. -ISYSTEM += \ - -isystem "$$[QT_INSTALL_HEADERS]" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtWidgets" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtXml" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtGui" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtXmlPatterns" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtCore" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtPrintSupport" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtSvg" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtNetwork" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtTest" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtConcurrent" - -} else { LIBS_USED_FOR_QT = \ QtCore \ QtSvg \ @@ -358,12 +341,17 @@ LIBS_USED_FOR_QT = \ QtTest \ QtConcurrent -for(somelib, $$list($$LIBS_USED_FOR_QT)) { - QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers" - QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers" +# Key -isystem disable checking errors in system headers. Marking ignore for warnings in Qt headers. +!macx{ +ISYSTEM += -isystem "$$[QT_INSTALL_HEADERS]" - ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers - ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers +for(somelib, $$list($$LIBS_USED_FOR_QT)) { + ISYSTEM += -isystem "$$[QT_INSTALL_HEADERS]/$${somelib}" +} +} else { +for(somelib, $$list($$LIBS_USED_FOR_QT)) { + ISYSTEM += -isystem "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers" + ISYSTEM += -isystem "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers" } } diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index a0b9c1afe..a1bfd651e 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -279,7 +279,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 8f8c6db24..c02d6d0a6 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -87,7 +87,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll @@ -127,7 +127,6 @@ message(Data files: $$[QT_INSTALL_DATA]) message(Translation files: $$[QT_INSTALL_TRANSLATIONS]) message(Settings: $$[QT_INSTALL_SETTINGS]) message(Examples: $$[QT_INSTALL_EXAMPLES]) -message(Default include dirs: $${QMAKE_DEFAULT_INCDIRS}) # Path to recource file. win32:RC_FILE = share/resources/valentina.rc diff --git a/src/libs/fervor/fervor.pro b/src/libs/fervor/fervor.pro index c1e49429d..279689cbf 100644 --- a/src/libs/fervor/fervor.pro +++ b/src/libs/fervor/fervor.pro @@ -65,7 +65,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/ifc/ifc.pro b/src/libs/ifc/ifc.pro index 9cb619406..bb30563d5 100644 --- a/src/libs/ifc/ifc.pro +++ b/src/libs/ifc/ifc.pro @@ -73,7 +73,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index 3e412e4e3..3ec0b161c 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -87,7 +87,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vformat/vformat.pro b/src/libs/vformat/vformat.pro index 9187bf2fb..ac5e65aea 100644 --- a/src/libs/vformat/vformat.pro +++ b/src/libs/vformat/vformat.pro @@ -66,7 +66,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vgeometry/vgeometry.pro b/src/libs/vgeometry/vgeometry.pro index 5b622ada1..e922fd0db 100644 --- a/src/libs/vgeometry/vgeometry.pro +++ b/src/libs/vgeometry/vgeometry.pro @@ -62,7 +62,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vlayout/vlayout.pro b/src/libs/vlayout/vlayout.pro index 9961d3bd3..9a8c4044a 100644 --- a/src/libs/vlayout/vlayout.pro +++ b/src/libs/vlayout/vlayout.pro @@ -65,7 +65,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro index bbf405eeb..38e39515b 100644 --- a/src/libs/vmisc/vmisc.pro +++ b/src/libs/vmisc/vmisc.pro @@ -71,7 +71,7 @@ CONFIG(debug, debug|release){ # Debug mode }else{ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vobj/vobj.pro b/src/libs/vobj/vobj.pro index 681be5e3c..cc73b3964 100644 --- a/src/libs/vobj/vobj.pro +++ b/src/libs/vobj/vobj.pro @@ -60,7 +60,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vpatterndb/vpatterndb.pro b/src/libs/vpatterndb/vpatterndb.pro index 0da411dc1..49c48e227 100644 --- a/src/libs/vpatterndb/vpatterndb.pro +++ b/src/libs/vpatterndb/vpatterndb.pro @@ -63,7 +63,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index 2db1877d6..54768e705 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -82,7 +82,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vtest/vtest.pro b/src/libs/vtest/vtest.pro index 729b3b36e..d4addab71 100644 --- a/src/libs/vtest/vtest.pro +++ b/src/libs/vtest/vtest.pro @@ -64,7 +64,7 @@ CONFIG(debug, debug|release){ # Debug mode }else{ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vtools/vtools.pro b/src/libs/vtools/vtools.pro index 4b58592c9..91ce3d161 100644 --- a/src/libs/vtools/vtools.pro +++ b/src/libs/vtools/vtools.pro @@ -70,7 +70,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vwidgets/vwidgets.pro b/src/libs/vwidgets/vwidgets.pro index a32cd65eb..c6884838e 100644 --- a/src/libs/vwidgets/vwidgets.pro +++ b/src/libs/vwidgets/vwidgets.pro @@ -62,7 +62,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/test/CollectionTest/CollectionTest.pro b/src/test/CollectionTest/CollectionTest.pro index 0193c67af..8d1262865 100644 --- a/src/test/CollectionTest/CollectionTest.pro +++ b/src/test/CollectionTest/CollectionTest.pro @@ -71,7 +71,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/test/ParserTest/ParserTest.pro b/src/test/ParserTest/ParserTest.pro index 968369fba..cc6de287f 100644 --- a/src/test/ParserTest/ParserTest.pro +++ b/src/test/ParserTest/ParserTest.pro @@ -71,7 +71,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += QT_NO_DEBUG_OUTPUT noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols diff --git a/src/test/TranslationsTest/TranslationsTest.pro b/src/test/TranslationsTest/TranslationsTest.pro index 9cd290f98..5ef2c3862 100644 --- a/src/test/TranslationsTest/TranslationsTest.pro +++ b/src/test/TranslationsTest/TranslationsTest.pro @@ -83,7 +83,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index fd9271f60..7cff6b9be 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -113,7 +113,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll