diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-08-04 13:11:32 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-08-04 13:18:24 (GMT) |
| commit | 6b07cbfc8d1368b3011af0b2c8fcfe312ccc10b3 (patch) | |
| tree | 6e106faaf0f032b69f72d3366bdd4c30a2eaa2e7 /src | |
| parent | daf150623578f24cdfb9c85dc1c79be685eb66cc (diff) | |
| download | Qt-6b07cbfc8d1368b3011af0b2c8fcfe312ccc10b3.zip Qt-6b07cbfc8d1368b3011af0b2c8fcfe312ccc10b3.tar.gz Qt-6b07cbfc8d1368b3011af0b2c8fcfe312ccc10b3.tar.bz2 | |
Fix installation on S60 5.0
A case change broke the case sensitive comparison of UIDs to check if the
package being built was Qt itself - this caused a recursive dependency
in the sis file.
Task-number: QTBUG-20742
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'src')
| -rwxr-xr-x | src/s60installs/s60installs.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 9a34227..cb51ba3 100755 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -10,10 +10,10 @@ symbian: { TARGET = "Qt$${QT_LIBINFIX}" isEmpty(QT_LIBINFIX) { - TARGET.UID3 = 0x2001e61c + TARGET.UID3 = 0x2001E61C } else { # Always use experimental UID for infixed configuration to avoid UID clash - TARGET.UID3 = 0xe001e61c + TARGET.UID3 = 0xE001E61C } VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} @@ -116,7 +116,7 @@ symbian: { # Support backup & restore for Qt libraries qtbackup.sources = backup_registration.xml - qtbackup.path = c:/private/10202d56/import/packages/$$replace(TARGET.UID3, 0x,) + qtbackup.path = c:/private/10202d56/import/packages/$$lower($$replace(TARGET.UID3, 0x,)) DEPLOYMENT += qtlibraries \ qtbackup \ |