diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-04 13:34:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-04 13:34:09 (GMT) |
| commit | 210399ea6ec35fe1e261d2d40bc23f5de3234013 (patch) | |
| tree | 8421c83d5bfd7f711bc7d5720927ef82213a7ce1 /src | |
| parent | c4495832d6c680af3116374471831a02b72a852e (diff) | |
| parent | 6b07cbfc8d1368b3011af0b2c8fcfe312ccc10b3 (diff) | |
| download | Qt-210399ea6ec35fe1e261d2d40bc23f5de3234013.zip Qt-210399ea6ec35fe1e261d2d40bc23f5de3234013.tar.gz Qt-210399ea6ec35fe1e261d2d40bc23f5de3234013.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 installation on S60 5.0
Fix fancybrowser.pro
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 \ |