summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-10-19 07:35:03 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-10-19 07:38:37 (GMT)
commit8786224d413f35c65939b7f378fd69cb327b5f27 (patch)
tree1d754ac5b255a042d98d6bbab25494a6db6599de
parent324f2d970674e6d4c2f6ed47ff30da593186c1b9 (diff)
downloadQt-8786224d413f35c65939b7f378fd69cb327b5f27.zip
Qt-8786224d413f35c65939b7f378fd69cb327b5f27.tar.gz
Qt-8786224d413f35c65939b7f378fd69cb327b5f27.tar.bz2
Fix partial upgrade package UID for libinfixed Qt
Libinfixed Qt has different UID than regular Qt, so partial upgrades of individual Qt libraries didn't work right when the UID was hardcoded to regular Qt UID. Reviewed-by: Janne Anttila
-rw-r--r--src/qbase.pri5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qbase.pri b/src/qbase.pri
index a44dca5..4217618 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -195,8 +195,11 @@ symbian {
"; Unique Vendor name" \
":\"Nokia, Qt\"" \
" "
+ isEmpty(QT_LIBINFIX): PARTIAL_UPGRADE_UID = 0x2001E61C
+ else: PARTIAL_UPGRADE_UID = 0xE001E61C
+
pu_header = "; Partial upgrade package for testing $${TARGET} changes without reinstalling everything" \
- "$${LITERAL_HASH}{\"$${TARGET}\"}, (0x2001E61C), $${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"
partial_upgrade.pkg_prerules = pu_header vendorinfo
partial_upgrade.sources = $$QMAKE_LIBDIR_QT/$${TARGET}.dll
partial_upgrade.path = c:/sys/bin