diff options
author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-01-14 12:35:08 (GMT) |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-01-14 12:35:08 (GMT) |
commit | d88a7e7a76deaa0c0e36d94a001d6f64834e22c2 (patch) | |
tree | 80b604a84c06efaa36ddf5e6eb324caf8aea66b0 /src/gui/gui.pro | |
parent | 645f29c727f33cc9f8b00b8efcb658a050ac6a26 (diff) | |
parent | f17aeadf56818e5f20e20eb91450e66adb88c99b (diff) | |
download | Qt-d88a7e7a76deaa0c0e36d94a001d6f64834e22c2.zip Qt-d88a7e7a76deaa0c0e36d94a001d6f64834e22c2.tar.gz Qt-d88a7e7a76deaa0c0e36d94a001d6f64834e22c2.tar.bz2 |
Merge remote branch 'origin/4.6' into lighthouse
Conflicts:
configure
src/corelib/global/qglobal.cpp
src/gui/dialogs/dialogs.pri
Diffstat (limited to 'src/gui/gui.pro')
-rw-r--r-- | src/gui/gui.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 6949e39..48f5a3f 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -54,4 +54,4 @@ DEFINES += Q_INTERNAL_QAPP_SRC symbian:TARGET.UID3=0x2001B2DD # ro-section in gui can exceed default allocated space, so more rw-section little further -symbian-sbsv2: MMP_RULES += "LINKEROPTION armcc --rw-base 0x800000" +symbian-sbsv2: QMAKE_LFLAGS.ARMCC += --rw-base 0x800000" |