diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-10 10:04:29 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-10 10:04:29 (GMT) |
| commit | 7651a4bacf8f34f3700853f147093a073f0472ab (patch) | |
| tree | d47559d6b0c6fc78b091095bbd8b8350c880e91b /src/gui/gui.pro | |
| parent | 175605f736ce76a9c0296aa607a6a82ea6675542 (diff) | |
| parent | f57a2756ebfb48c2fad94c0c319fa181d2af4dfd (diff) | |
| download | Qt-7651a4bacf8f34f3700853f147093a073f0472ab.zip Qt-7651a4bacf8f34f3700853f147093a073f0472ab.tar.gz Qt-7651a4bacf8f34f3700853f147093a073f0472ab.tar.bz2 | |
Merge remote branch 'remotes/qt/4.6' into lighthouse
Conflicts:
configure
tests/auto/qwidget/tst_qwidget.cpp
Diffstat (limited to 'src/gui/gui.pro')
| -rw-r--r-- | src/gui/gui.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 48f5a3f..e57aa60 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -54,4 +54,5 @@ 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: QMAKE_LFLAGS.ARMCC += --rw-base 0x800000" +symbian-sbsv2: QMAKE_LFLAGS.ARMCC += --rw-base 0x800000 +symbian: QMAKE_LFLAGS.GCCE += -Tdata 0xC00000 |