diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-16 23:00:15 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-16 23:00:15 (GMT) |
| commit | f021555182edb4163d1bca29ed16da6748029771 (patch) | |
| tree | 4e08270009ae458e698f52b4de2172e5f97b511e /mkspecs | |
| parent | da1b6e7199dfd63cce79af0bd875df78b4d199db (diff) | |
| parent | 640aad736476f7f8a4ec92fedecae234fb2e2d2e (diff) | |
| download | Qt-f021555182edb4163d1bca29ed16da6748029771.zip Qt-f021555182edb4163d1bca29ed16da6748029771.tar.gz Qt-f021555182edb4163d1bca29ed16da6748029771.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'mkspecs')
| -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 |