Qmake. Fix masks to support 64 bit versions of compilers.

--HG--
branch : develop

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" )

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.
 

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 \

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
             }
         }

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

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  += \

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
             }
         }

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

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 \

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

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

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

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

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

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\

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 {

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

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 \

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

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 -= \
+        # QMAKE_CXXFLAGS -= \
-            -Weffc++ \
-            -Wconversion \
-            -Wold-style-cast \
-            -Wstack-protector \
-            -Wswitch-default \
-            -Wimplicit-fallthrough \
-            -Wfloat-equal
 
         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

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 \

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

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

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 \

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

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

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

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

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

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 \

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

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

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 \

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

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

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 \

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

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

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 \

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 {

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

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 \

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

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

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
 

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

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

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 \

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

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

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 =

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

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
     }
 }
 

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

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 =

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

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 =

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