diff options
| author | Pasi Pentikainen <ext-pasi.a.pentikainen@nokia.com> | 2012-06-15 12:13:45 +0300 |
|---|---|---|
| committer | Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com> | 2012-06-20 09:39:45 +0200 |
| commit | adcf76f4a3b515072369322a6a862f297b5ef33e (patch) | |
| tree | 00cbe015c2d177c05753685f56591d93ef5cbc76 | |
| parent | 53f305cf02ed9694b0bcac113590d89794752927 (diff) | |
| download | qt4-tools-adcf76f4a3b515072369322a6a862f297b5ef33e.tar.gz | |
Symbian: shift package minor version to enable intermediate updates
Change the Symbian stub and sis package version minor number to be
100 * actual minor number (from 4.8.1 to 4.8.100 now), so that any
potential intermediate sis/iad updates on top of 4.8.0 will be
correctly removed when a new firmware is installed on phone.
Task-number: ou1cimx1#1007333
Change-Id: I2d0ddc8e04e1d8bd0f8bdacab62ceb07edc40647
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
| -rw-r--r-- | config.profiles/symbian/qt.pkg | 2 | ||||
| -rw-r--r-- | config.profiles/symbian/qt_stub.pkg | 2 | ||||
| -rw-r--r-- | config.profiles/symbian/qtdemoapps.pkg | 2 | ||||
| -rw-r--r-- | src/s60installs/s60installs.pro | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/config.profiles/symbian/qt.pkg b/config.profiles/symbian/qt.pkg index 59fd526141..0355e625d8 100644 --- a/config.profiles/symbian/qt.pkg +++ b/config.profiles/symbian/qt.pkg @@ -2,7 +2,7 @@ &EN ; SIS header: name, uid, version -#{"Qt"},(0x2001E61C),4,8,1,TYPE=SA,RU +#{"Qt"},(0x2001E61C),4,8,100,TYPE=SA,RU ; Manual PKG pre-rules from PRO files ; Default HW/platform dependencies diff --git a/config.profiles/symbian/qt_stub.pkg b/config.profiles/symbian/qt_stub.pkg index c31fe2906c..84e59ea791 100644 --- a/config.profiles/symbian/qt_stub.pkg +++ b/config.profiles/symbian/qt_stub.pkg @@ -3,7 +3,7 @@ ; SIS header: name, uid, version -#{"Qt"},(0x2001E61C),4,8,1 +#{"Qt"},(0x2001E61C),4,8,100 ; Manual PKG pre-rules from PRO files diff --git a/config.profiles/symbian/qtdemoapps.pkg b/config.profiles/symbian/qtdemoapps.pkg index 9ffc7cdb0f..292f781472 100644 --- a/config.profiles/symbian/qtdemoapps.pkg +++ b/config.profiles/symbian/qtdemoapps.pkg @@ -2,7 +2,7 @@ &EN ; SIS header: name, uid, version -#{"Qtdemo"},(0xE001E61C),4,8,1,TYPE=SA +#{"Qtdemo"},(0xE001E61C),4,8,100,TYPE=SA ; Localised Vendor name %{"Nokia, Qt"} diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index a66359e788..d23996933a 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -15,7 +15,7 @@ symbian: { # Always use experimental UID for infixed configuration to avoid UID clash TARGET.UID3 = 0xE001E61C } - VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} + VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}00 DESTDIR = $$QMAKE_LIBDIR_QT @@ -71,7 +71,7 @@ symbian: { ":\"Nokia, Qt\"" \ " " - ru_header = "$${LITERAL_HASH}{\"$${TARGET}\"}, ($$TARGET.UID3), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=SA,RU" + ru_header = "$${LITERAL_HASH}{\"$${TARGET}\"}, ($$TARGET.UID3), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}00, TYPE=SA,RU" qtlibraries.pkg_prerules = ru_header vendorinfo qtlibraries.pkg_prerules += "; Dependencies of Qt libraries" |