diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-03-01 13:03:22 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-03-01 13:17:53 (GMT) |
| commit | 19095f432ef7ef424ea8dc89b19e43ed9f031b3e (patch) | |
| tree | 159654fbd2066eaea6d6fe78efc9726b5959eb3d /src/gui/gui.pro | |
| parent | 196e1484c22f6347061fa433987a86d90e178a55 (diff) | |
| parent | 236c3ad7bacf165069b834b62fede6b147cfaf03 (diff) | |
| download | Qt-19095f432ef7ef424ea8dc89b19e43ed9f031b3e.zip Qt-19095f432ef7ef424ea8dc89b19e43ed9f031b3e.tar.gz Qt-19095f432ef7ef424ea8dc89b19e43ed9f031b3e.tar.bz2 | |
Merge remote branch 'qt/4.7' into lighthouse-4.7
Conflicts:
configure
src/gui/egl/qegl.cpp
src/gui/kernel/qdnd_p.h
Diffstat (limited to 'src/gui/gui.pro')
| -rw-r--r-- | src/gui/gui.pro | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index e57aa60..b03977c 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -51,8 +51,27 @@ 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:TARGET.UID3=0x2001B2DD +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 + + # Partial upgrade SIS file + vendorinfo = \ + "&EN" \ + "; Localised Vendor name" \ + "%{\"Nokia, Qt\"}" \ + " " \ + "; Unique Vendor name" \ + ":\"Nokia, Qt\"" \ + " " + pu_header = "; Partial upgrade package for testing QtGui changes without reinstalling everything" \ + "$${LITERAL_HASH}{\"Qt gui\"}, (0x2001E61C), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU" + partial_upgrade.pkg_prerules = pu_header vendorinfo + partial_upgrade.sources = qtgui.dll + partial_upgrade.path = c:/sys/bin + DEPLOYMENT = partial_upgrade $$DEPLOYMENT +} -# ro-section in gui can exceed default allocated space, so more rw-section little further -symbian-sbsv2: QMAKE_LFLAGS.ARMCC += --rw-base 0x800000 -symbian: QMAKE_LFLAGS.GCCE += -Tdata 0xC00000 |