Fixed warning.pri for CollectionTest and TranslationsTest libraries.

--HG--
branch : develop

src/test/CollectionTest/CollectionTest.pro

@@ -50,16 +50,9 @@ HEADERS += \
 # Set using ccache. Function enable_ccache() defined in common.pri.
 $$enable_ccache()
 
-CONFIG(debug, debug|release){
+include(warnings.pri)
-    # Debug mode
+
-    unix {
+CONFIG(release, debug|release){
-        include(warnings.pri)
-    } else {
-        *-g++{
-            QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
-        }
-    }
-}else{
     # Release mode
     !win32-msvc*:CONFIG += silent
     DEFINES += V_NO_ASSERT
@@ -67,10 +60,6 @@ CONFIG(debug, debug|release){
         QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
     }
 
-    checkWarnings{
-        unix:include(warnings.pri)
-    }
-
     noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
         # do nothing
     } else {

src/test/CollectionTest/warnings.pri

@@ -1,5 +1,6 @@
 #Turn on compilers warnings.
-*-g++{
+unix {
+    *-g++{
         QMAKE_CXXFLAGS += \
             # Key -isystem disable checking errors in system headers.
             -isystem "$${OUT_PWD}/$${UI_DIR}" \
@@ -20,9 +21,9 @@
             QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
             QMAKE_LFLAGS += -fsanitize=address
         }
-}
+    }
 
-clang*{
+    clang*{
         QMAKE_CXXFLAGS += \
             # Key -isystem disable checking errors in system headers.
             -isystem "$${OUT_PWD}/$${UI_DIR}" \
@@ -34,9 +35,9 @@ clang*{
         checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
             QMAKE_CXXFLAGS += -Werror
         }
-}
+    }
 
-*-icc-*{
+    *-icc-*{
         QMAKE_CXXFLAGS += \
             -isystem "$${OUT_PWD}/$${UI_DIR}" \
             -isystem "$${OUT_PWD}/$${MOC_DIR}" \
@@ -46,4 +47,21 @@ clang*{
         checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
             QMAKE_CXXFLAGS += -Werror
         }
+    }
+} else { # Windows
+    *-g++{
+        QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
+
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+            QMAKE_CXXFLAGS += -Werror
+        }
+    }
+
+    win32-msvc*{
+        QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details.
+
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+            QMAKE_CXXFLAGS += -WX
+        }
+    }
 }

src/test/TranslationsTest/TranslationsTest.pro

@@ -54,16 +54,9 @@ $$enable_ccache()
 
 DEFINES += TS_DIR=\\\"$${PWD}/../../../share/translations\\\"
 
-CONFIG(debug, debug|release){
+include(warnings.pri)
-    # Debug mode
+
-    unix {
+CONFIG(release, debug|release){
-        include(warnings.pri)
-    } else {
-        *-g++{
-            QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
-        }
-    }
-}else{
     # Release mode
     !win32-msvc*:CONFIG += silent
     DEFINES += V_NO_ASSERT
@@ -71,10 +64,6 @@ CONFIG(debug, debug|release){
         QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
     }
 
-    checkWarnings{
-        unix:include(warnings.pri)
-    }
-
     noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
         # do nothing
     } else {

src/test/TranslationsTest/warnings.pri

@@ -1,5 +1,6 @@
 #Turn on compilers warnings.
-*-g++{
+unix {
+    *-g++{
         QMAKE_CXXFLAGS += \
             # Key -isystem disable checking errors in system headers.
             -isystem "$${OUT_PWD}/$${UI_DIR}" \
@@ -20,9 +21,9 @@
             QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
             QMAKE_LFLAGS += -fsanitize=address
         }
-}
+    }
 
-clang*{
+    clang*{
         QMAKE_CXXFLAGS += \
             # Key -isystem disable checking errors in system headers.
             -isystem "$${OUT_PWD}/$${UI_DIR}" \
@@ -34,9 +35,9 @@ clang*{
         checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
             QMAKE_CXXFLAGS += -Werror
         }
-}
+    }
 
-*-icc-*{
+    *-icc-*{
         QMAKE_CXXFLAGS += \
             -isystem "$${OUT_PWD}/$${UI_DIR}" \
             -isystem "$${OUT_PWD}/$${MOC_DIR}" \
@@ -46,4 +47,21 @@ clang*{
         checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
             QMAKE_CXXFLAGS += -Werror
         }
+    }
+} else { # Windows
+    *-g++{
+        QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
+
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+            QMAKE_CXXFLAGS += -Werror
+        }
+    }
+
+    win32-msvc*{
+        QMAKE_CXXFLAGS += $$MSVC_DEBUG_CXXFLAGS # See common.pri for more details.
+
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+            QMAKE_CXXFLAGS += -WX
+        }
+    }
 }