summaryrefslogtreecommitdiffstats
path: root/src/s60installs
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-03-18 12:40:46 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-03-19 09:57:52 (GMT)
commit4542e8dbc2aeb942a8c963724c02da5220deef4f (patch)
treed5796315dd3b81812c7a76b4e24c6ce381f62e8d /src/s60installs
parentb45f6f856fe72629e2e0752fc8732de487278f41 (diff)
downloadQt-4542e8dbc2aeb942a8c963724c02da5220deef4f.zip
Qt-4542e8dbc2aeb942a8c963724c02da5220deef4f.tar.gz
Qt-4542e8dbc2aeb942a8c963724c02da5220deef4f.tar.bz2
Enable s60main.rsc infixing.
Now s60main.rsc file is also infixed, making infixed and vanilla builds indepenendent of each other. Task-number: QTBUG-9065 Reviewed-by: Shane Kearns
Diffstat (limited to 'src/s60installs')
-rw-r--r--src/s60installs/s60installs.pro8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index ec03673..1f6e72b 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -12,10 +12,7 @@ symbian: {
isEmpty(QT_LIBINFIX) {
TARGET.UID3 = 0x2001E61C
- # s60main.rsc and sqlite3 are expected to be already found on phone if
- # infixed configuration is built.
- DEPLOYMENT += qtresources
-
+ # sqlite3 is expected to be already found on phone if infixed configuration is built.
sqlitedeployment = \
"; Deploy sqlite onto phone that does not have it already" \
"@\"$$PWD/sqlite3.sis\", (0x2002af5f)"
@@ -26,8 +23,9 @@ symbian: {
}
VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
- qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main.rsc
+ qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main$${QT_LIBINFIX}.rsc
qtresources.path = c:$$APP_RESOURCE_DIR
+ DEPLOYMENT += qtresources
qtlibraries.sources = \
QtCore$${QT_LIBINFIX}.dll \