diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-10-01 08:25:02 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-10-01 08:30:59 (GMT) |
| commit | 55bf3ab3fb5591544e1f6a7996d5fdedb8e699c9 (patch) | |
| tree | 9b703e4383552fb8bc851e4d328dd8967652d342 | |
| parent | 904a8f5a079243a9718898f8ae3f07c6f4e73800 (diff) | |
| download | Qt-55bf3ab3fb5591544e1f6a7996d5fdedb8e699c9.zip Qt-55bf3ab3fb5591544e1f6a7996d5fdedb8e699c9.tar.gz Qt-55bf3ab3fb5591544e1f6a7996d5fdedb8e699c9.tar.bz2 | |
Remove partial upgrade deployment generation for Webkit
Generic partial upgrade package deployment generation in qbase.pri
wrecks webkit pkg files.
Reviewed-by: axis
| -rw-r--r-- | src/qbase.pri | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/qbase.pri b/src/qbase.pri index b431ade..e565e4a 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -185,18 +185,21 @@ include(qt_targets.pri) win32:DEFINES+=_USE_MATH_DEFINES symbian { - # Partial upgrade SIS file - vendorinfo = \ - "; Localised Vendor name" \ - "%{\"Nokia, Qt\"}" \ - " " \ - "; Unique Vendor name" \ - ":\"Nokia, Qt\"" \ - " " - 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" - partial_upgrade.pkg_prerules = pu_header vendorinfo - partial_upgrade.sources = $$QMAKE_LIBDIR_QT/$${TARGET}.dll - partial_upgrade.path = c:/sys/bin - DEPLOYMENT += partial_upgrade + # Make partial upgrade SIS file for all dll's except webkit + !contains(TARGET.UID3, 0x200267C2):!contains(TARGET.UID3, 0xE00267C2) { + # Partial upgrade SIS file + vendorinfo = \ + "; Localised Vendor name" \ + "%{\"Nokia, Qt\"}" \ + " " \ + "; Unique Vendor name" \ + ":\"Nokia, Qt\"" \ + " " + 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" + partial_upgrade.pkg_prerules = pu_header vendorinfo + partial_upgrade.sources = $$QMAKE_LIBDIR_QT/$${TARGET}.dll + partial_upgrade.path = c:/sys/bin + DEPLOYMENT += partial_upgrade + } } |