summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Kearns <ext-shane.2.kearns@nokia.com>2012-01-24 16:19:49 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-01-26 13:07:18 (GMT)
commita2db5a8bd09e56d62c3a5fb34e1de293a44dca35 (patch)
tree35d822674a00db166150c9ac985f2f8522682440
parentb23631015c23a49e3b4d296ea0a6266bfce3d4f1 (diff)
downloadQt-a2db5a8bd09e56d62c3a5fb34e1de293a44dca35.zip
Qt-a2db5a8bd09e56d62c3a5fb34e1de293a44dca35.tar.gz
Qt-a2db5a8bd09e56d62c3a5fb34e1de293a44dca35.tar.bz2
Symbian - add rom upgrade flag to Qt sis files
The rom upgrade flag allows the sis file to be installed if there is already a version of the dll in rom. The flag is silently ignored unless the sis file is properly signed with a certificate trusted for this purpose. This change saves developers needing to edit pkg files after running qmake. Change-Id: I0914734c951ea1f0d1c48b169bee0b022bc9e275 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
-rw-r--r--src/plugins/qpluginbase.pri2
-rw-r--r--src/qbase.pri2
-rw-r--r--src/s60installs/s60installs.pro3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri
index bcf473f..b2a7cf2 100644
--- a/src/plugins/qpluginbase.pri
+++ b/src/plugins/qpluginbase.pri
@@ -33,7 +33,7 @@ symbian: {
else: PARTIAL_UPGRADE_UID = 0xE001E61C
pu_header = "; Partial upgrade package for testing $${TARGET} changes without reinstalling everything" \
- "$${LITERAL_HASH}{\"$${TARGET}\"}, ($$PARTIAL_UPGRADE_UID), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU"
+ "$${LITERAL_HASH}{\"$${TARGET}\"}, ($$PARTIAL_UPGRADE_UID), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU,RU"
partial_upgrade.pkg_prerules = pu_header vendorinfo
partial_upgrade.files = $$QMAKE_LIBDIR_QT/$${TARGET}.dll
partial_upgrade.path = c:/sys/bin
diff --git a/src/qbase.pri b/src/qbase.pri
index 632d7f4..13d4adf 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -209,7 +209,7 @@ symbian {
else: PARTIAL_UPGRADE_UID = 0xE001E61C
pu_header = "; Partial upgrade package for testing $${TARGET} changes without reinstalling everything" \
- "$${LITERAL_HASH}{\"$${TARGET}\"}, ($$PARTIAL_UPGRADE_UID), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU"
+ "$${LITERAL_HASH}{\"$${TARGET}\"}, ($$PARTIAL_UPGRADE_UID), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU,RU"
partial_upgrade.pkg_prerules = pu_header vendorinfo
partial_upgrade.files = $$QMAKE_LIBDIR_QT/$${TARGET}.dll
partial_upgrade.path = c:/sys/bin
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index d5281f4..a66359e 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -71,8 +71,9 @@ symbian: {
":\"Nokia, Qt\"" \
" "
+ ru_header = "$${LITERAL_HASH}{\"$${TARGET}\"}, ($$TARGET.UID3), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=SA,RU"
- qtlibraries.pkg_prerules = vendorinfo
+ qtlibraries.pkg_prerules = ru_header vendorinfo
qtlibraries.pkg_prerules += "; Dependencies of Qt libraries"
# It is expected that Symbian^3 and newer phones will have sufficiently new OpenC already installed