diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 13:36:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-23 14:10:58 +0100 |
| commit | 3b512ae142017f105f297467f74dc28d3cb9030a (patch) | |
| tree | 9e131e23c01537f051851a1da9576c1e1ddf5ba2 /mkspecs/common | |
| parent | e20c4730192f312881591fb50e571af0a88fe421 (diff) | |
| parent | f956f9a83603a3df5651e3238c24e8df37558d6e (diff) | |
Merge master into api_changes
Change-Id: I93551e4d13a1b0815b359b9415060e9089477db1
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/qcc-base.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/qcc-base.conf b/mkspecs/common/qcc-base.conf index 5aa09cf21d..a9e86efb75 100644 --- a/mkspecs/common/qcc-base.conf +++ b/mkspecs/common/qcc-base.conf @@ -7,7 +7,7 @@ # as it's on by default in qcc (and has an analogous -nopipe option) # -QMAKE_CFLAGS += +QMAKE_CFLAGS += -Wno-psabi QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w |