diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2010-02-16 09:20:30 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2010-02-16 09:23:42 (GMT) |
| commit | 916d59cec5247f8df9a3a5e0e329d973dc4380c0 (patch) | |
| tree | 2455dd3d519eaa73010896c5dcffe3e0c73e067d /src | |
| parent | e024cc10a97b9518b2dd577175feb66258d7ac05 (diff) | |
| download | Qt-916d59cec5247f8df9a3a5e0e329d973dc4380c0.zip Qt-916d59cec5247f8df9a3a5e0e329d973dc4380c0.tar.gz Qt-916d59cec5247f8df9a3a5e0e329d973dc4380c0.tar.bz2 | |
Partial upgrade packages for QtCore and QtGui
When debugging or benchmarking changes in QtCore / QtGui, it is
inconvenient to reinstall the whole of Qt.
This allows 'make sis' to generate a partial upgrade sis files,
which can be installed on top of an existing Qt installation.
This relies on binary compatibility, so you should be using def files.
Self-signed partial upgrade can only install on top of self-signed Qt.
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/corelib.pro | 16 | ||||
| -rw-r--r-- | src/gui/gui.pro | 27 |
2 files changed, 39 insertions, 4 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 9a15bf1..efee610 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -35,4 +35,20 @@ symbian: { # Workaroud for problems with paging this dll MMP_RULES -= PAGED MMP_RULES *= UNPAGED + + # Partial upgrade SIS file + vendorinfo = \ + "&EN" \ + "; Localised Vendor name" \ + "%{\"Nokia, Qt\"}" \ + " " \ + "; Unique Vendor name" \ + ":\"Nokia, Qt\"" \ + " " + pu_header = "; Partial upgrade package for testing QtCore changes without reinstalling everything" \ + "$${LITERAL_HASH}{\"Qt corelib\"}, (0x2001E61C), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU" + partial_upgrade.pkg_prerules = pu_header vendorinfo + partial_upgrade.sources = qtcore.dll + partial_upgrade.path = c:/sys/bin + DEPLOYMENT = partial_upgrade $$DEPLOYMENT } diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 8ad3bac..d46f3b4 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 |