Skip to content

Commit adcf76f

Browse files
author
Pasi Pentikainen
committed
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 <[email protected]> Reviewed-by: Pasi Pentikäinen <[email protected]>
1 parent 53f305c commit adcf76f

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

config.profiles/symbian/qt.pkg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
&EN
33

44
; SIS header: name, uid, version
5-
#{"Qt"},(0x2001E61C),4,8,1,TYPE=SA,RU
5+
#{"Qt"},(0x2001E61C),4,8,100,TYPE=SA,RU
66

77
; Manual PKG pre-rules from PRO files
88
; Default HW/platform dependencies

config.profiles/symbian/qt_stub.pkg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44

55
; SIS header: name, uid, version
6-
#{"Qt"},(0x2001E61C),4,8,1
6+
#{"Qt"},(0x2001E61C),4,8,100
77

88

99
; Manual PKG pre-rules from PRO files

config.profiles/symbian/qtdemoapps.pkg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
&EN
33

44
; SIS header: name, uid, version
5-
#{"Qtdemo"},(0xE001E61C),4,8,1,TYPE=SA
5+
#{"Qtdemo"},(0xE001E61C),4,8,100,TYPE=SA
66

77
; Localised Vendor name
88
%{"Nokia, Qt"}

src/s60installs/s60installs.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ symbian: {
1515
# Always use experimental UID for infixed configuration to avoid UID clash
1616
TARGET.UID3 = 0xE001E61C
1717
}
18-
VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
18+
VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}00
1919

2020
DESTDIR = $$QMAKE_LIBDIR_QT
2121

@@ -71,7 +71,7 @@ symbian: {
7171
":\"Nokia, Qt\"" \
7272
" "
7373

74-
ru_header = "$${LITERAL_HASH}{\"$${TARGET}\"}, ($$TARGET.UID3), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=SA,RU"
74+
ru_header = "$${LITERAL_HASH}{\"$${TARGET}\"}, ($$TARGET.UID3), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}00, TYPE=SA,RU"
7575

7676
qtlibraries.pkg_prerules = ru_header vendorinfo
7777
qtlibraries.pkg_prerules += "; Dependencies of Qt libraries"

0 commit comments

Comments
 (0)