diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 14:41:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-22 14:41:54 (GMT) |
| commit | bb878bb1ee9a5272359e88d44806971e13c31486 (patch) | |
| tree | ef823d980775448085d8f2130027a46cd08dafe8 /mkspecs | |
| parent | b7ba409b0dabd382876310a6c110a96cf0e3c6bf (diff) | |
| parent | 42f7c123e95c6d9f1d0ece648f61defa79627ab8 (diff) | |
| download | Qt-bb878bb1ee9a5272359e88d44806971e13c31486.zip Qt-bb878bb1ee9a5272359e88d44806971e13c31486.tar.gz Qt-bb878bb1ee9a5272359e88d44806971e13c31486.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
We also don't need to watch for org.freedesktop.DBus changing owners
Avoid adding match rules for NameAcquired and NameLost
We don't need to add a match rule to receive messages targetted at us.
Save the D-Bus's base service earlier.
Pre-populate the watched services hash with org.freedesktop.DBus
Quick performance optimisation: cache a QString with "org.freedesktop.DBus"
XML schema internals: fix memory leak
QNAM: Use QFileNetworkReply for qrc:/ URL schema
Make the de-inlined isRightToLeft not get called from updateProperties
Update the ICC mkspec: keep the stack aligned to 16-byte
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 3b26f7d..af56a9a 100644 --- a/mkspecs/linux-icc/qmake.conf +++ b/mkspecs/linux-icc/qmake.conf @@ -21,7 +21,7 @@ QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = +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_OFF = -w |