summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2011-10-28 20:05:34 +0200
committerQt by Nokia <qt-info@nokia.com>2011-11-01 09:23:40 +0100
commit9c4547eea38622fd7d4f7f6fee413bf5fb3a5ba7 (patch)
tree911118c806164a43d1f8126f215498c93a5f2569 /configure
parentd304b3a5bb9b5c6f2bba22d2f0c42972c6c9f1d1 (diff)
Append -W* configure flags to QMAKE_C*FLAGS_WARN_ON
... instead of adding them to all C*FLAGS. This makes it possible to pass -Wno-warning-name to configure to disable certain warnings enabled by default (which didn't work previously). This also has the added benefit that only projects that have CONFIG+=warn_on will get the extra warning flags. Change-Id: I7bbc100155e02e7ccb9ac3be14bd8f585b7bc39b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index 738e157748..f001e75de8 100755
--- a/configure
+++ b/configure
@@ -7410,9 +7410,9 @@ fi
if [ '!' -z "$W_FLAGS" ]; then
# add the user defined warning flags
- QMakeVar add QMAKE_CFLAGS "$W_FLAGS"
- QMakeVar add QMAKE_CXXFLAGS "$W_FLAGS"
- QMakeVar add QMAKE_OBJECTIVE_CFLAGS "$W_FLAGS"
+ QMakeVar add QMAKE_CFLAGS_WARN_ON "$W_FLAGS"
+ QMakeVar add QMAKE_CXXFLAGS_WARN_ON "$W_FLAGS"
+ QMakeVar add QMAKE_OBJECTIVE_CFLAGS_WARN_ON "$W_FLAGS"
fi
# turn off exceptions for the compilers that support it