diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-03-09 15:53:19 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-03-09 16:00:15 (GMT) |
| commit | 02f6da62a42bd1059eb0da091d1f46efbb919750 (patch) | |
| tree | 94da8ffcb99f1d61e356a84f985dcb6dd5bb5e65 /src | |
| parent | fbe80a0094d7ef501f2308e70f19342f875dd94c (diff) | |
| download | Qt-02f6da62a42bd1059eb0da091d1f46efbb919750.zip Qt-02f6da62a42bd1059eb0da091d1f46efbb919750.tar.gz Qt-02f6da62a42bd1059eb0da091d1f46efbb919750.tar.bz2 | |
Use the same concept for per-lib tweaks as armcc
Now the compiler specific options in gui.pro and WebCore.pro are
only for the mmp based build systems. Lets make that clear and mark
them as such.
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 10 | ||||
| -rw-r--r-- | src/gui/gui.pro | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 1870a80..2095179 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -24,10 +24,12 @@ symbian: { DEPLOYMENT += webkitlibs webkitbackup - # RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target. - # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000. - QMAKE_LFLAGS.ARMCC += --rw-base 0xE00000 - CONFIG += do_not_build_as_thumb + symbian-abld:symbian-sbsv2 { + # RO text (code) section in qtwebkit.dll exceeds allocated space for gcce udeb target. + # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000. + QMAKE_LFLAGS.ARMCC += --rw-base 0xE00000 + CONFIG += do_not_build_as_thumb + } } include($$PWD/../WebKit.pri) diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 37d39b7..52531a3 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -51,12 +51,14 @@ contains(DEFINES,QT_EVAL):include($$QT_SOURCE_TREE/src/corelib/eval.pri) QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtGui.dynlist DEFINES += Q_INTERNAL_QAPP_SRC -symbian: { +symbian { TARGET.UID3=0x2001B2DD - # ro-section in gui can exceed default allocated space, so move rw-section a little further - QMAKE_LFLAGS.ARMCC += --rw-base 0x800000 - QMAKE_LFLAGS.GCCE += -Tdata 0xC00000 + symbian-abld:symbian-sbsv2 { + # ro-section in gui can exceed default allocated space, so move rw-section a little further + QMAKE_LFLAGS.ARMCC += --rw-base 0x800000 + QMAKE_LFLAGS.GCCE += -Tdata 0xC00000 + } # Partial upgrade SIS file vendorinfo = \ |