diff -r dee5afe5301f -r 3f74d0d4af4c src/gui/gui.pro --- a/src/gui/gui.pro Mon Mar 15 12:43:09 2010 +0200 +++ b/src/gui/gui.pro Thu Apr 08 14:19:33 2010 +0300 @@ -40,12 +40,7 @@ include(math3d/math3d.pri) include(effects/effects.pri) -# :QTP:We can always include against egl on symbian, it works even when EGL/OpenVG is not supported -symbian { - include(egl/egl.pri) -} else { - contains(QT_CONFIG, egl): include(egl/egl.pri) -} +contains(QT_CONFIG, egl): include(egl/egl.pri) embedded: QT += network @@ -56,8 +51,26 @@ 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 -# 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 + # Partial upgrade SIS file + vendorinfo = \ + "; 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 +} +