Changes: moving Werror flag to one common.pri file

RevBy: Mirek
sailfishos · Aug 19, 2010 · 1ff76f1 · 1ff76f1
1 parent b4fbbad
commit 1ff76f1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/benchmarks/common_top.pri b/benchmarks/common_top.pri
@@ -35,7 +35,6 @@ win32|macx {
     LIBS += -lmeegotouchcore
 }
 
-QMAKE_CXXFLAGS += -Werror
 support_files.files =
 support_files.path = $$[QT_INSTALL_LIBS]/libmeegotouch-benchmarks
 INSTALLS += support_files

diff --git a/mkspecs/common.pri b/mkspecs/common.pri
@@ -5,15 +5,20 @@ QMAKE_TARGET_PRODUCT = DirectUI
 QMAKE_TARGET_DESCRIPTION = DirectUI Framework
 QMAKE_TARGET_COPYRIGHT = Copyright (C) 2010 Nokia
 
-contains( DEFINES, HAVE_N900 ) {
-    QMAKE_CFLAGS -= -Werror
-    QMAKE_CXXFLAGS -= -Werror
-}
 
 # Features
 # Parts to build. Options: libs tests benchmarks demos doc debian
 #M_BUILD_PARTS = libs tests benchmarks demos doc debian
 
+#disable werrors on windows and freemantle
+win32 {
+   } else {
+         contains( DEFINES, HAVE_N900 ) {
+         } else {
+             QMAKE_CFLAGS *= -Werror
+             QMAKE_CXXFLAGS *= -Werror
+         }
+    }
 
 contains(TEMPLATE, app) {
     DEFINES += M_APPLICATION_NAME=\\\"${QMAKE_TARGET}\\\"

diff --git a/plainqt/style/style.pro b/plainqt/style/style.pro
@@ -1,5 +1,3 @@
-QMAKE_CXXFLAGS += -Werror
-
 MROOT = ../..
 
 include($$MROOT/mkspecs/common.pri)

diff --git a/src/common_top.pri b/src/common_top.pri
@@ -24,11 +24,9 @@ CONFIG += qt warn_on depend_includepath qmake_cache target_qt dll create_prl
 !win32:CONFIG += link_pkgconfig
 macx:CONFIG += lib_bundle
 
-QMAKE_CFLAGS += -Werror
-
 QMAKE_CXXFLAGS += -DM_EXPORTS
 !win32-msvc*:QMAKE_CXXFLAGS += -Wno-long-long -pedantic
-!win32:QMAKE_CXXFLAGS += -Werror -Wno-variadic-macros -fvisibility=hidden
+!win32:QMAKE_CXXFLAGS += -Wno-variadic-macros -fvisibility=hidden
 
 !win32-msvc*:LIBS += -lm -lX11
 macx:LIBS -= -lX11

diff --git a/tests/common_top.pri b/tests/common_top.pri
@@ -38,8 +38,6 @@ win32|macx {
     LIBS += -lmeegotouchcore -lmeegotouchviews
 }
 
-QMAKE_CXXFLAGS += -Werror
-
 support_files.files =
 support_files.path = $$[QT_INSTALL_LIBS]/libmeegotouch-tests
 INSTALLS += support_files