diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-19 09:35:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-19 09:35:41 (GMT) |
| commit | 59095bbc545a6abc1723bfb53dbd2118f86d4578 (patch) | |
| tree | 78ab7e34a2b51f7918bc9bc5e530e764447bf0ca /src | |
| parent | d4c43e13d5eef1bd1862539150a694580804d0c7 (diff) | |
| parent | 8786224d413f35c65939b7f378fd69cb327b5f27 (diff) | |
| download | Qt-59095bbc545a6abc1723bfb53dbd2118f86d4578.zip Qt-59095bbc545a6abc1723bfb53dbd2118f86d4578.tar.gz Qt-59095bbc545a6abc1723bfb53dbd2118f86d4578.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix partial upgrade package UID for libinfixed Qt
Fixed recursive sis file generation.
Readded DESTDIR that was removed by mistake in a3c755e358596.
Diffstat (limited to 'src')
| -rw-r--r-- | src/qbase.pri | 9 | ||||
| -rw-r--r-- | src/s60installs/s60installs.pro | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/qbase.pri b/src/qbase.pri index e565e4a..4217618 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -185,8 +185,8 @@ include(qt_targets.pri) win32:DEFINES+=_USE_MATH_DEFINES symbian { - # Make partial upgrade SIS file for all dll's except webkit - !contains(TARGET.UID3, 0x200267C2):!contains(TARGET.UID3, 0xE00267C2) { + # Make partial upgrade SIS file for all dll's except webkit and s60main + !contains(TARGET.UID3, 0x200267C2):!contains(TARGET.UID3, 0xE00267C2):!contains(TARGET.UID3, 0x2001E61F):!contains(TARGET.UID3, 0xE001E61F) { # Partial upgrade SIS file vendorinfo = \ "; Localised Vendor name" \ @@ -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 diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index d63b97c..9559da6 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -35,6 +35,8 @@ symbian: { } VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} + DESTDIR = $$QMAKE_LIBDIR_QT + qtlibraries.sources = \ $$QMAKE_LIBDIR_QT/QtCore$${QT_LIBINFIX}.dll \ $$QMAKE_LIBDIR_QT/QtXml$${QT_LIBINFIX}.dll \ |