diff --git a/Valentina.pro b/Valentina.pro index 86f7dc1fa..8607bd36e 100644 --- a/Valentina.pro +++ b/Valentina.pro @@ -14,7 +14,7 @@ LIST = $$split(OUT_PWD,' ') count(LIST, 1, >): error("The build will fail. Path '$${OUT_PWD}' contains space!!!") unix { - *-g++ { + *g++* { GCC_VERSION = $$system("g++ -dumpversion") contains(GCC_VERSION, ^7.*$) { message( "g++ version 7.x found" ) diff --git a/common.pri b/common.pri index 15710da56..e923764b2 100644 --- a/common.pri +++ b/common.pri @@ -46,7 +46,7 @@ macx{ } CONFIG(release, debug|release){ - !noDebugSymbols:win32:!win32-msvc*{ + !noDebugSymbols:win32:!*msvc*{ unset(QMAKE_STRIP) QMAKE_STRIP = echo # we do striping manualy } @@ -135,7 +135,7 @@ defineReplace(set_PCH){ PRECOMPILED_HEADER = stable.h # Header file with all all static headers: libraries, static local headers. export(PRECOMPILED_HEADER) # export value to global variable - win32-msvc* { + *msvc* { PRECOMPILED_SOURCE = stable.cpp # MSVC need also cpp file. export(PRECOMPILED_SOURCE) # export value to global variable. } @@ -150,14 +150,14 @@ defineReplace(enable_ccache){ # ccache support only Unix systems. unix:{ # This need for turn on ccache. - *-g++{ + *g++*{ QMAKE_CC = ccache gcc export(QMAKE_CC) # export value to global variable. QMAKE_CXX = ccache g++ export(QMAKE_CXX) # export value to global variable. } - clang*{ + *clang*{ QMAKE_CC = ccache clang export(QMAKE_CC) # export value to global variable. diff --git a/src/app/tape/tape.pri b/src/app/tape/tape.pri index 77d754cb2..6f46e9e94 100644 --- a/src/app/tape/tape.pri +++ b/src/app/tape/tape.pri @@ -13,7 +13,7 @@ SOURCES += \ $$PWD/dialogs/configpages/tapepreferencesconfigurationpage.cpp \ $$PWD/dialogs/configpages/tapepreferencespathpage.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp HEADERS += \ $$PWD/tmainwindow.h \ diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index 2500aceb5..a2c3fb540 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -289,9 +289,9 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } @@ -303,7 +303,7 @@ CONFIG(release, debug|release){ } # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. Need find way how to strip binary file. - !macx:!win32-msvc*{ + !macx:!*msvc*{ QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 QMAKE_CFLAGS_RELEASE += -g -gdwarf-3 QMAKE_LFLAGS_RELEASE = @@ -439,7 +439,7 @@ noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols } else { # Strip after you link all libaries. CONFIG(release, debug|release){ - win32:!win32-msvc*{ + win32:!*msvc*{ # Strip debug symbols. QMAKE_POST_LINK += objcopy --only-keep-debug bin/${TARGET} bin/${TARGET}.dbg && QMAKE_POST_LINK += objcopy --strip-debug bin/${TARGET} && @@ -453,7 +453,7 @@ noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols QMAKE_POST_LINK += objcopy --add-gnu-debuglink="${TARGET}.dbg" ${TARGET} } - !macx:!win32-msvc*{ + !macx:!*msvc*{ QMAKE_DISTCLEAN += bin/${TARGET}.dbg } } diff --git a/src/app/tape/warnings.pri b/src/app/tape/warnings.pri index d62d467cf..da69ccfc3 100644 --- a/src/app/tape/warnings.pri +++ b/src/app/tape/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${UI_DIR}" \ @@ -36,7 +36,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${UI_DIR}" \ @@ -67,7 +67,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -75,7 +75,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/app/valentina/valentina.pri b/src/app/valentina/valentina.pri index 5d8817f59..ea340f837 100644 --- a/src/app/valentina/valentina.pri +++ b/src/app/valentina/valentina.pri @@ -12,7 +12,7 @@ SOURCES += \ $$PWD/mainwindow.cpp \ $$PWD/mainwindowsnogui.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp # Some header files HEADERS += \ diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index b6ea57ef0..6847a49e1 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -72,9 +72,9 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } @@ -86,7 +86,7 @@ CONFIG(release, debug|release){ } # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. Need find way how to strip binary file. - !macx:!win32-msvc*{ + !macx:!*msvc*{ QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 QMAKE_CFLAGS_RELEASE += -g -gdwarf-3 QMAKE_LFLAGS_RELEASE = @@ -255,7 +255,7 @@ unix{ # "make install" command for Windows. # Depend on inno setup script and create installer in folder "package" -win32:*-g++ { +win32:*g++* { package.path = $${OUT_PWD}/../../../package/valentina package.files += \ $${OUT_PWD}/$${DESTDIR}/valentina.exe \ @@ -572,7 +572,7 @@ noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols } else { # Strip after you link all libaries. CONFIG(release, debug|release){ - win32:!win32-msvc*{ + win32:!*msvc*{ # Strip debug symbols. QMAKE_POST_LINK += objcopy --only-keep-debug bin/${TARGET} bin/${TARGET}.dbg && QMAKE_POST_LINK += objcopy --strip-debug bin/${TARGET} && @@ -586,7 +586,7 @@ noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols QMAKE_POST_LINK += objcopy --add-gnu-debuglink="${TARGET}.dbg" ${TARGET} } - !macx:!win32-msvc*{ + !macx:!*msvc*{ QMAKE_DISTCLEAN += bin/${TARGET}.dbg } } diff --git a/src/app/valentina/warnings.pri b/src/app/valentina/warnings.pri index 7e423668b..00232e03b 100644 --- a/src/app/valentina/warnings.pri +++ b/src/app/valentina/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${UI_DIR}" \ @@ -37,7 +37,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${UI_DIR}" \ @@ -70,7 +70,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -78,7 +78,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/libs/fervor/fervor.pri b/src/libs/fervor/fervor.pri index b2b217475..b2eba637a 100644 --- a/src/libs/fervor/fervor.pri +++ b/src/libs/fervor/fervor.pri @@ -6,7 +6,7 @@ SOURCES += \ $$PWD/fvupdater.cpp \ $$PWD/fvavailableupdate.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp HEADERS += \ $$PWD/fvupdatewindow.h \ diff --git a/src/libs/fervor/fervor.pro b/src/libs/fervor/fervor.pro index fa2f901d7..b39e0a18c 100644 --- a/src/libs/fervor/fervor.pro +++ b/src/libs/fervor/fervor.pro @@ -49,16 +49,16 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { - !macx:!win32-msvc*{ + !macx:!*msvc*{ # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 diff --git a/src/libs/fervor/warnings.pri b/src/libs/fervor/warnings.pri index e1d21128d..540039203 100644 --- a/src/libs/fervor/warnings.pri +++ b/src/libs/fervor/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -35,7 +35,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -58,7 +58,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -66,7 +66,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/libs/ifc/ifc.pri b/src/libs/ifc/ifc.pri index 7117f407c..a84c4ff8f 100644 --- a/src/libs/ifc/ifc.pri +++ b/src/libs/ifc/ifc.pri @@ -12,4 +12,4 @@ HEADERS += \ SOURCES += \ $$PWD/ifcdef.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp diff --git a/src/libs/ifc/ifc.pro b/src/libs/ifc/ifc.pro index 5f29fd9ad..53b34eedd 100644 --- a/src/libs/ifc/ifc.pro +++ b/src/libs/ifc/ifc.pro @@ -57,16 +57,16 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { - !macx:!win32-msvc*{ + !macx:!*msvc*{ # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 diff --git a/src/libs/ifc/warnings.pri b/src/libs/ifc/warnings.pri index 501a0efeb..8dd06f7b5 100644 --- a/src/libs/ifc/warnings.pri +++ b/src/libs/ifc/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -35,7 +35,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -64,7 +64,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -72,7 +72,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/libs/qmuparser/qmuparser.pri b/src/libs/qmuparser/qmuparser.pri index 42ee28d42..a2ccd04bf 100644 --- a/src/libs/qmuparser/qmuparser.pri +++ b/src/libs/qmuparser/qmuparser.pri @@ -14,7 +14,7 @@ SOURCES += \ $$PWD/qmutokenparser.cpp \ $$PWD/qmudef.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp HEADERS += \ $$PWD/qmuparser.h\ diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index 9d9d98c04..785d12831 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -77,16 +77,16 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } noStripDebugSymbols { # do nothing } else { - !macx:!win32-msvc*{ + !macx:!*msvc*{ noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { diff --git a/src/libs/qmuparser/warnings.pri b/src/libs/qmuparser/warnings.pri index 84d1846db..254b7637e 100644 --- a/src/libs/qmuparser/warnings.pri +++ b/src/libs/qmuparser/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -34,7 +34,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -55,7 +55,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -63,7 +63,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/libs/vdxf/vdxf.pri b/src/libs/vdxf/vdxf.pri index 198ba0e4e..21824cb9f 100644 --- a/src/libs/vdxf/vdxf.pri +++ b/src/libs/vdxf/vdxf.pri @@ -26,7 +26,7 @@ SOURCES += \ $$PWD/dxiface.cpp \ $$PWD/dxfdef.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp HEADERS += \ $$PWD/stable.h \ diff --git a/src/libs/vdxf/vdxf.pro b/src/libs/vdxf/vdxf.pro index 3af4e08a1..835c7762f 100644 --- a/src/libs/vdxf/vdxf.pro +++ b/src/libs/vdxf/vdxf.pro @@ -48,14 +48,14 @@ CONFIG(release, debug|release){ # Release mode CONFIG += silent - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { - !macx:!win32-msvc*{ + !macx:!*msvc*{ # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 diff --git a/src/libs/vdxf/warnings.pri b/src/libs/vdxf/warnings.pri index 074e23573..27eafff23 100644 --- a/src/libs/vdxf/warnings.pri +++ b/src/libs/vdxf/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -12,14 +12,7 @@ unix { # -isystem key works only for headers. In some cases it's not enough. But we can't delete these warnings and # want them in the global list. Compromise decision is to delete them from the local list. - QMAKE_CXXFLAGS -= \ - -Weffc++ \ - -Wconversion \ - -Wold-style-cast \ - -Wstack-protector \ - -Wswitch-default \ - -Wimplicit-fallthrough \ - -Wfloat-equal + # QMAKE_CXXFLAGS -= \ noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer # do nothing @@ -43,9 +36,12 @@ unix { QMAKE_LFLAGS += -fsanitize=undefined } } + + message(Qt version: $$QMAKESPEC) + } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -66,7 +62,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -74,7 +70,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/libs/vformat/vformat.pri b/src/libs/vformat/vformat.pri index 9369fa205..5afe5834a 100644 --- a/src/libs/vformat/vformat.pri +++ b/src/libs/vformat/vformat.pri @@ -4,7 +4,7 @@ SOURCES += \ $$PWD/vmeasurements.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp HEADERS += \ $$PWD/vmeasurements.h \ diff --git a/src/libs/vformat/vformat.pro b/src/libs/vformat/vformat.pro index ae1e9c541..550cb6810 100644 --- a/src/libs/vformat/vformat.pro +++ b/src/libs/vformat/vformat.pro @@ -50,16 +50,16 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { - !macx:!win32-msvc*{ + !macx:!*msvc*{ # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 diff --git a/src/libs/vformat/warnings.pri b/src/libs/vformat/warnings.pri index 84d1846db..254b7637e 100644 --- a/src/libs/vformat/warnings.pri +++ b/src/libs/vformat/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -34,7 +34,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -55,7 +55,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -63,7 +63,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/libs/vgeometry/vgeometry.pri b/src/libs/vgeometry/vgeometry.pri index 9caf4e3a3..039d6e477 100644 --- a/src/libs/vgeometry/vgeometry.pri +++ b/src/libs/vgeometry/vgeometry.pri @@ -17,7 +17,7 @@ SOURCES += \ $$PWD/vabstractarc.cpp \ $$PWD/vabstractbezier.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp HEADERS += \ $$PWD/stable.h \ diff --git a/src/libs/vgeometry/vgeometry.pro b/src/libs/vgeometry/vgeometry.pro index 445dc546c..cac11c1ba 100644 --- a/src/libs/vgeometry/vgeometry.pro +++ b/src/libs/vgeometry/vgeometry.pro @@ -46,16 +46,16 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { - !macx:!win32-msvc*{ + !macx:!*msvc*{ # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 diff --git a/src/libs/vgeometry/warnings.pri b/src/libs/vgeometry/warnings.pri index 84d1846db..254b7637e 100644 --- a/src/libs/vgeometry/warnings.pri +++ b/src/libs/vgeometry/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -34,7 +34,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -55,7 +55,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -63,7 +63,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/libs/vlayout/vlayout.pri b/src/libs/vlayout/vlayout.pri index 7d12980f9..892ebd7fa 100644 --- a/src/libs/vlayout/vlayout.pri +++ b/src/libs/vlayout/vlayout.pri @@ -36,4 +36,4 @@ SOURCES += \ $$PWD/vlayoutpiece.cpp \ $$PWD/vlayoutpiecepath.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp diff --git a/src/libs/vlayout/vlayout.pro b/src/libs/vlayout/vlayout.pro index edfa51766..25352a9cf 100644 --- a/src/libs/vlayout/vlayout.pro +++ b/src/libs/vlayout/vlayout.pro @@ -49,13 +49,13 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } - !win32-msvc* { + !*msvc* { QMAKE_CXXFLAGS -= -O2 # Disable default optimization level QMAKE_CXXFLAGS += -O3 # For vlayout library enable speed optimizations } @@ -63,7 +63,7 @@ CONFIG(release, debug|release){ noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { - !macx:!win32-msvc*{ + !macx:!*msvc*{ # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 diff --git a/src/libs/vlayout/warnings.pri b/src/libs/vlayout/warnings.pri index 29c54daef..767194c77 100644 --- a/src/libs/vlayout/warnings.pri +++ b/src/libs/vlayout/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -35,7 +35,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -64,7 +64,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -72,7 +72,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/libs/vmisc/vmisc.pri b/src/libs/vmisc/vmisc.pri index 40a07b8c2..7d50f2884 100644 --- a/src/libs/vmisc/vmisc.pri +++ b/src/libs/vmisc/vmisc.pri @@ -14,7 +14,7 @@ SOURCES += \ $$PWD/vtablesearch.cpp \ $$PWD/dialogs/dialogexporttocsv.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp HEADERS += \ $$PWD/stable.h \ diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro index 6837861f7..6b9083695 100644 --- a/src/libs/vmisc/vmisc.pro +++ b/src/libs/vmisc/vmisc.pro @@ -63,16 +63,16 @@ CONFIG(debug, debug|release){ DEFINES += "LATEST_TAG_DISTANCE=0" }else{ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { - !macx:!win32-msvc*{ + !macx:!*msvc*{ # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 diff --git a/src/libs/vmisc/warnings.pri b/src/libs/vmisc/warnings.pri index e51b6ce38..24184cea5 100644 --- a/src/libs/vmisc/warnings.pri +++ b/src/libs/vmisc/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -35,7 +35,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -64,7 +64,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -72,7 +72,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/libs/vobj/vobj.pri b/src/libs/vobj/vobj.pri index c21292726..7e4c07e28 100644 --- a/src/libs/vobj/vobj.pri +++ b/src/libs/vobj/vobj.pri @@ -7,7 +7,7 @@ SOURCES += \ $$PWD/delaunay.cpp \ $$PWD/predicates.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp HEADERS += \ $$PWD/vobjengine.h \ diff --git a/src/libs/vobj/vobj.pro b/src/libs/vobj/vobj.pro index 2c5c6806f..33a9c6a7a 100644 --- a/src/libs/vobj/vobj.pro +++ b/src/libs/vobj/vobj.pro @@ -44,16 +44,16 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { - !macx:!win32-msvc*{ + !macx:!*msvc*{ # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 diff --git a/src/libs/vobj/warnings.pri b/src/libs/vobj/warnings.pri index 84d1846db..254b7637e 100644 --- a/src/libs/vobj/warnings.pri +++ b/src/libs/vobj/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -34,7 +34,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -55,7 +55,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -63,7 +63,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/libs/vpatterndb/vpatterndb.pri b/src/libs/vpatterndb/vpatterndb.pri index 46e4e0fde..f33c11f22 100644 --- a/src/libs/vpatterndb/vpatterndb.pri +++ b/src/libs/vpatterndb/vpatterndb.pri @@ -28,7 +28,7 @@ SOURCES += \ $$PWD/measurements.cpp \ $$PWD/pmsystems.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp HEADERS += \ $$PWD/vcontainer.h \ diff --git a/src/libs/vpatterndb/vpatterndb.pro b/src/libs/vpatterndb/vpatterndb.pro index 10c0b507f..157d28b34 100644 --- a/src/libs/vpatterndb/vpatterndb.pro +++ b/src/libs/vpatterndb/vpatterndb.pro @@ -47,16 +47,16 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { - !macx:!win32-msvc*{ + !macx:!*msvc*{ # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 diff --git a/src/libs/vpatterndb/warnings.pri b/src/libs/vpatterndb/warnings.pri index 84d1846db..254b7637e 100644 --- a/src/libs/vpatterndb/warnings.pri +++ b/src/libs/vpatterndb/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -34,7 +34,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -55,7 +55,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -63,7 +63,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pri b/src/libs/vpropertyexplorer/vpropertyexplorer.pri index a2ed82098..a647804a0 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pri +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pri @@ -32,7 +32,7 @@ SOURCES += \ $$PWD/checkablemessagebox.cpp \ $$PWD/plugins/vlabelproperty.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp HEADERS +=\ $$PWD/vpropertyexplorer_global.h \ diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index 4b4981e3d..10fda7bbb 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -72,9 +72,9 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } @@ -82,7 +82,7 @@ CONFIG(release, debug|release){ unix:include(warnings.pri) } - !macx:!win32-msvc*{ + !macx:!*msvc*{ noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { diff --git a/src/libs/vpropertyexplorer/warnings.pri b/src/libs/vpropertyexplorer/warnings.pri index 7dc8dd997..fd9a8a71d 100644 --- a/src/libs/vpropertyexplorer/warnings.pri +++ b/src/libs/vpropertyexplorer/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ -isystem "$${OUT_PWD}/$${MOC_DIR}" \ # Key -isystem disable checking errors in system headers. @@ -39,7 +39,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -65,7 +65,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -73,7 +73,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/libs/vtest/vtest.pri b/src/libs/vtest/vtest.pri index 471c37137..06decad9f 100644 --- a/src/libs/vtest/vtest.pri +++ b/src/libs/vtest/vtest.pri @@ -4,7 +4,7 @@ SOURCES += \ $$PWD/abstracttest.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp HEADERS += \ $$PWD/stable.h \ diff --git a/src/libs/vtest/vtest.pro b/src/libs/vtest/vtest.pro index 4080aabb1..06665a75e 100644 --- a/src/libs/vtest/vtest.pro +++ b/src/libs/vtest/vtest.pro @@ -57,16 +57,16 @@ CONFIG(debug, debug|release){ DEFINES += "LATEST_TAG_DISTANCE=0" }else{ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { - !macx:!win32-msvc*{ + !macx:!*msvc*{ # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 diff --git a/src/libs/vtest/warnings.pri b/src/libs/vtest/warnings.pri index 436c13e29..f4a43deba 100644 --- a/src/libs/vtest/warnings.pri +++ b/src/libs/vtest/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -39,7 +39,7 @@ unix { -Wswitch-default } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -65,7 +65,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -73,7 +73,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/libs/vtools/vtools.pri b/src/libs/vtools/vtools.pri index ba301cfc1..464204b73 100644 --- a/src/libs/vtools/vtools.pri +++ b/src/libs/vtools/vtools.pri @@ -9,5 +9,5 @@ include(undocommands/undocommands.pri) HEADERS += \ $$PWD/stable.h -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp diff --git a/src/libs/vtools/vtools.pro b/src/libs/vtools/vtools.pro index f5c3df237..bcbe5e01f 100644 --- a/src/libs/vtools/vtools.pro +++ b/src/libs/vtools/vtools.pro @@ -54,16 +54,16 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { - !macx:!win32-msvc*{ + !macx:!*msvc*{ # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 diff --git a/src/libs/vtools/warnings.pri b/src/libs/vtools/warnings.pri index 7ba9cd26e..9c069161b 100644 --- a/src/libs/vtools/warnings.pri +++ b/src/libs/vtools/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${UI_DIR}" \ @@ -36,7 +36,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -63,7 +63,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -71,7 +71,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/libs/vwidgets/vwidgets.pri b/src/libs/vwidgets/vwidgets.pri index 36a06b93d..400730a4a 100644 --- a/src/libs/vwidgets/vwidgets.pri +++ b/src/libs/vwidgets/vwidgets.pri @@ -23,7 +23,7 @@ SOURCES += \ $$PWD/vscenepoint.cpp \ $$PWD/scalesceneitems.cpp -win32-msvc*:SOURCES += $$PWD/stable.cpp +*msvc*:SOURCES += $$PWD/stable.cpp HEADERS += \ $$PWD/stable.h \ diff --git a/src/libs/vwidgets/vwidgets.pro b/src/libs/vwidgets/vwidgets.pro index 926786dbb..1a9171b2f 100644 --- a/src/libs/vwidgets/vwidgets.pro +++ b/src/libs/vwidgets/vwidgets.pro @@ -46,16 +46,16 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols # do nothing } else { - !macx:!win32-msvc*{ + !macx:!*msvc*{ # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. TODO: find way how to strip binary file. QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 diff --git a/src/libs/vwidgets/warnings.pri b/src/libs/vwidgets/warnings.pri index 436c13e29..f4a43deba 100644 --- a/src/libs/vwidgets/warnings.pri +++ b/src/libs/vwidgets/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -39,7 +39,7 @@ unix { -Wswitch-default } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${MOC_DIR}" \ @@ -65,7 +65,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -73,7 +73,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/test/CollectionTest/CollectionTest.pro b/src/test/CollectionTest/CollectionTest.pro index 9a6a62de4..53086b52d 100644 --- a/src/test/CollectionTest/CollectionTest.pro +++ b/src/test/CollectionTest/CollectionTest.pro @@ -47,7 +47,7 @@ SOURCES += \ tst_tapecommandline.cpp \ tst_valentinacommandline.cpp -win32-msvc*:SOURCES += stable.cpp +*msvc*:SOURCES += stable.cpp HEADERS += \ stable.h \ @@ -61,9 +61,9 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } @@ -72,7 +72,7 @@ CONFIG(release, debug|release){ } else { # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. Need find way how to strip binary file. - !macx:!win32-msvc*{ + !macx:!*msvc*{ QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 QMAKE_CFLAGS_RELEASE += -g -gdwarf-3 QMAKE_LFLAGS_RELEASE = diff --git a/src/test/CollectionTest/warnings.pri b/src/test/CollectionTest/warnings.pri index 4a5f1b8ca..605e67666 100644 --- a/src/test/CollectionTest/warnings.pri +++ b/src/test/CollectionTest/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${UI_DIR}" \ @@ -36,7 +36,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${UI_DIR}" \ @@ -62,7 +62,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -70,7 +70,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/test/ParserTest/ParserTest.pro b/src/test/ParserTest/ParserTest.pro index ae16eb9e2..f9fe9698a 100644 --- a/src/test/ParserTest/ParserTest.pro +++ b/src/test/ParserTest/ParserTest.pro @@ -44,7 +44,7 @@ HEADERS += \ SOURCES += \ main.cpp -win32-msvc*:SOURCES += stable.cpp +*msvc*:SOURCES += stable.cpp # Set using ccache. Function enable_ccache() defined in common.pri. $$enable_ccache() @@ -53,7 +53,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += QT_NO_DEBUG_OUTPUT noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols @@ -61,7 +61,7 @@ CONFIG(release, debug|release){ } else { # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. Need find way how to strip binary file. - !macx:!win32-msvc*:QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 + !macx:!*msvc*:QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 } } diff --git a/src/test/ParserTest/warnings.pri b/src/test/ParserTest/warnings.pri index 56b721ade..20bc5663f 100644 --- a/src/test/ParserTest/warnings.pri +++ b/src/test/ParserTest/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. @@ -32,7 +32,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ $$CLANG_DEBUG_CXXFLAGS # See common.pri for more details. @@ -55,7 +55,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -63,7 +63,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/test/TranslationsTest/TranslationsTest.pro b/src/test/TranslationsTest/TranslationsTest.pro index fe50bb019..5beaa03e1 100644 --- a/src/test/TranslationsTest/TranslationsTest.pro +++ b/src/test/TranslationsTest/TranslationsTest.pro @@ -50,7 +50,7 @@ SOURCES += \ tst_buitinregexp.cpp \ tst_abstractregexp.cpp -win32-msvc*:SOURCES += stable.cpp +*msvc*:SOURCES += stable.cpp HEADERS += \ stable.h \ @@ -69,9 +69,9 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } @@ -80,7 +80,7 @@ CONFIG(release, debug|release){ } else { # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. Need find way how to strip binary file. - !macx:!win32-msvc*{ + !macx:!*msvc*{ QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 QMAKE_CFLAGS_RELEASE += -g -gdwarf-3 QMAKE_LFLAGS_RELEASE = diff --git a/src/test/TranslationsTest/warnings.pri b/src/test/TranslationsTest/warnings.pri index 4a5f1b8ca..605e67666 100644 --- a/src/test/TranslationsTest/warnings.pri +++ b/src/test/TranslationsTest/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${UI_DIR}" \ @@ -36,7 +36,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${UI_DIR}" \ @@ -62,7 +62,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -70,7 +70,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index 9c36931cd..62d4dac48 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -64,7 +64,7 @@ SOURCES += \ tst_vtranslatevars.cpp \ tst_vabstractpiece.cpp -win32-msvc*:SOURCES += stable.cpp +*msvc*:SOURCES += stable.cpp HEADERS += \ tst_vposter.h \ @@ -97,9 +97,9 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !win32-msvc*:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT - !unix:*-g++{ + !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll } @@ -108,7 +108,7 @@ CONFIG(release, debug|release){ } else { # Turn on debug symbols in release mode on Unix systems. # On Mac OS X temporarily disabled. Need find way how to strip binary file. - !macx:!win32-msvc*{ + !macx:!*msvc*{ QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3 QMAKE_CFLAGS_RELEASE += -g -gdwarf-3 QMAKE_LFLAGS_RELEASE = diff --git a/src/test/ValentinaTest/warnings.pri b/src/test/ValentinaTest/warnings.pri index 4a5f1b8ca..605e67666 100644 --- a/src/test/ValentinaTest/warnings.pri +++ b/src/test/ValentinaTest/warnings.pri @@ -1,6 +1,6 @@ #Turn on compilers warnings. unix { - *-g++{ + *g++*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${UI_DIR}" \ @@ -36,7 +36,7 @@ unix { } } - clang*{ + *clang*{ QMAKE_CXXFLAGS += \ # Key -isystem disable checking errors in system headers. -isystem "$${OUT_PWD}/$${UI_DIR}" \ @@ -62,7 +62,7 @@ unix { } } } else { # Windows - *-g++{ + *g++*{ QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings @@ -70,7 +70,7 @@ unix { } } - win32-msvc*{ + *msvc*{ QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details. checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings