diff options
| author | Peter Yard <peter.yard@nokia.com> | 2010-12-22 06:04:57 (GMT) |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2010-12-22 06:04:57 (GMT) |
| commit | 53b018a42813e44787aa1edc35d59feaa86cf9d7 (patch) | |
| tree | 7cce8f18faf26a87cfb5f27d1417c2a2ec86470c /mkspecs/linux-icc/qmake.conf | |
| parent | 55c32b91a298d52bd7c29968d21b4b7a5ee741e4 (diff) | |
| parent | afa22a20c1b89960b647b0e3a9dc390fe6f87eae (diff) | |
| download | Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.zip Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.tar.gz Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'mkspecs/linux-icc/qmake.conf')
| -rw-r--r-- | mkspecs/linux-icc/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf index af56a9a..ba707e23 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf @@ -23,7 +23,7 @@ QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -falign-stack=maintain-16-byte QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -w1 -Wcheck -wd654,1572,411,873,1125 +QMAKE_CFLAGS_WARN_ON = -w1 -Wcheck -wd654,1572,411,873,1125,2259 QMAKE_CFLAGS_WARN_OFF = -w QMAKE_CFLAGS_RELEASE = -O2 -falign-functions=16 -ansi-alias -fstrict-aliasing QMAKE_CFLAGS_DEBUG = -O0 -g |