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,49 +1,67 @@
 #Turn on compilers warnings.
-*-g++{
+unix {
-    QMAKE_CXXFLAGS += \
+    *-g++{
-        # Key -isystem disable checking errors in system headers.
+        QMAKE_CXXFLAGS += \
-        -isystem "$${OUT_PWD}/$${UI_DIR}" \
+            # Key -isystem disable checking errors in system headers.
-        -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+            -isystem "$${OUT_PWD}/$${UI_DIR}" \
-        -isystem "$${OUT_PWD}/$${RCC_DIR}" \
+            -isystem "$${OUT_PWD}/$${MOC_DIR}" \
-        $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
+            -isystem "$${OUT_PWD}/$${RCC_DIR}" \
+            $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
 
-    checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
-        QMAKE_CXXFLAGS += -Werror
+            QMAKE_CXXFLAGS += -Werror
+        }
+
+        noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
+            # do nothing
+        } else {
+            #gcc’s 4.8.0 Address Sanitizer
+            #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
+            QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+            QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+            QMAKE_LFLAGS += -fsanitize=address
+        }
     }
 
-    noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
+    clang*{
-        # do nothing
+        QMAKE_CXXFLAGS += \
-    } else {
+            # Key -isystem disable checking errors in system headers.
-        #gcc’s 4.8.0 Address Sanitizer
+            -isystem "$${OUT_PWD}/$${UI_DIR}" \
-        #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
+            -isystem "$${OUT_PWD}/$${MOC_DIR}" \
-        QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+            -isystem "$${OUT_PWD}/$${RCC_DIR}" \
-        QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+            $$CLANG_DEBUG_CXXFLAGS \ # See common.pri for more details.
-        QMAKE_LFLAGS += -fsanitize=address
+            -Wno-gnu-zero-variadic-macro-arguments\ # See macros QSKIP
-    }
+
-}
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
-
+            QMAKE_CXXFLAGS += -Werror
-clang*{
+        }
-    QMAKE_CXXFLAGS += \
+    }
-        # Key -isystem disable checking errors in system headers.
+
-        -isystem "$${OUT_PWD}/$${UI_DIR}" \
+    *-icc-*{
-        -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+        QMAKE_CXXFLAGS += \
-        -isystem "$${OUT_PWD}/$${RCC_DIR}" \
+            -isystem "$${OUT_PWD}/$${UI_DIR}" \
-        $$CLANG_DEBUG_CXXFLAGS \ # See common.pri for more details.
+            -isystem "$${OUT_PWD}/$${MOC_DIR}" \
-        -Wno-gnu-zero-variadic-macro-arguments\ # See macros QSKIP
+            -isystem "$${OUT_PWD}/$${RCC_DIR}" \
-
+            $$ICC_DEBUG_CXXFLAGS
-    checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+
-        QMAKE_CXXFLAGS += -Werror
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
-    }
+            QMAKE_CXXFLAGS += -Werror
-}
+        }
-
+    }
-*-icc-*{
+} else { # Windows
-    QMAKE_CXXFLAGS += \
+    *-g++{
-        -isystem "$${OUT_PWD}/$${UI_DIR}" \
+        QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
-        -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+
-        -isystem "$${OUT_PWD}/$${RCC_DIR}" \
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
-        $$ICC_DEBUG_CXXFLAGS
+            QMAKE_CXXFLAGS += -Werror
-
+        }
-    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,49 +1,67 @@
 #Turn on compilers warnings.
-*-g++{
+unix {
-    QMAKE_CXXFLAGS += \
+    *-g++{
-        # Key -isystem disable checking errors in system headers.
+        QMAKE_CXXFLAGS += \
-        -isystem "$${OUT_PWD}/$${UI_DIR}" \
+            # Key -isystem disable checking errors in system headers.
-        -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+            -isystem "$${OUT_PWD}/$${UI_DIR}" \
-        -isystem "$${OUT_PWD}/$${RCC_DIR}" \
+            -isystem "$${OUT_PWD}/$${MOC_DIR}" \
-        $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
+            -isystem "$${OUT_PWD}/$${RCC_DIR}" \
+            $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
 
-    checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
-        QMAKE_CXXFLAGS += -Werror
+            QMAKE_CXXFLAGS += -Werror
+        }
+
+        noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
+            # do nothing
+        } else {
+            #gcc’s 4.8.0 Address Sanitizer
+            #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
+            QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+            QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+            QMAKE_LFLAGS += -fsanitize=address
+        }
     }
 
-    noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
+    clang*{
-        # do nothing
+        QMAKE_CXXFLAGS += \
-    } else {
+            # Key -isystem disable checking errors in system headers.
-        #gcc’s 4.8.0 Address Sanitizer
+            -isystem "$${OUT_PWD}/$${UI_DIR}" \
-        #http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
+            -isystem "$${OUT_PWD}/$${MOC_DIR}" \
-        QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
+            -isystem "$${OUT_PWD}/$${RCC_DIR}" \
-        QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+            $$CLANG_DEBUG_CXXFLAGS \ # See common.pri for more details.
-        QMAKE_LFLAGS += -fsanitize=address
+            -Wno-gnu-zero-variadic-macro-arguments\ # See macros QSKIP
-    }
+
-}
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
-
+            QMAKE_CXXFLAGS += -Werror
-clang*{
+        }
-    QMAKE_CXXFLAGS += \
+    }
-        # Key -isystem disable checking errors in system headers.
+
-        -isystem "$${OUT_PWD}/$${UI_DIR}" \
+    *-icc-*{
-        -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+        QMAKE_CXXFLAGS += \
-        -isystem "$${OUT_PWD}/$${RCC_DIR}" \
+            -isystem "$${OUT_PWD}/$${UI_DIR}" \
-        $$CLANG_DEBUG_CXXFLAGS \ # See common.pri for more details.
+            -isystem "$${OUT_PWD}/$${MOC_DIR}" \
-        -Wno-gnu-zero-variadic-macro-arguments\ # See macros QSKIP
+            -isystem "$${OUT_PWD}/$${RCC_DIR}" \
-
+            $$ICC_DEBUG_CXXFLAGS
-    checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
+
-        QMAKE_CXXFLAGS += -Werror
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
-    }
+            QMAKE_CXXFLAGS += -Werror
-}
+        }
-
+    }
-*-icc-*{
+} else { # Windows
-    QMAKE_CXXFLAGS += \
+    *-g++{
-        -isystem "$${OUT_PWD}/$${UI_DIR}" \
+        QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See common.pri for more details.
-        -isystem "$${OUT_PWD}/$${MOC_DIR}" \
+
-        -isystem "$${OUT_PWD}/$${RCC_DIR}" \
+        checkWarnings{ # For enable run qmake with CONFIG+=checkWarnings
-        $$ICC_DEBUG_CXXFLAGS
+            QMAKE_CXXFLAGS += -Werror
-
+        }
-    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
+        }
     }
 }