summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/s60installs/s60installs.pro30
1 files changed, 19 insertions, 11 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 390cc11..62661ed 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -6,7 +6,7 @@ symbian: {
SUBDIRS=
# WARNING: Changing TARGET name will break Symbian SISX upgrade functionality
- # DO NOT TOUCH TARGET VARIABLE IF YOU ARE NOT SURE WHAT YOU ARE DOING
+ # DO NOT TOUCH TARGET VARIABLE IF YOU ARE NOT SURE WHAT YOU ARE DOING
TARGET = "Qt for S60"
TARGET.UID3 = 0x2001E61C
VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
@@ -20,19 +20,27 @@ symbian: {
QtGui.dll \
QtNetwork.dll \
QtTest.dll \
- QtSql.dll \
- qts60plugin_3_1.dll \
- qts60plugin_3_2.dll \
- qts60plugin_5_0.dll
-
-
+ QtSql.dll
+
+ qts60plugindeployment = \
+ "IF package(0x1028315F)" \
+ " \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0.dll\" - \"!:\\sys\\bin\\qts60plugin_5_0.dll\"" \
+ "ELSEIF package(0x102752AE)" \
+ " \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_2.dll\" - \"!:\\sys\\bin\\qts60plugin_3_2.dll\"" \
+ "ELSEIF package(0x102032BE)" \
+ " \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_3_1.dll\" - \"!:\\sys\\bin\\qts60plugin_3_1.dll\"" \
+ "ELSE" \
+ " \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/qts60plugin_5_0.dll\" - \"!:\\sys\\bin\\qts60plugin_5_0.dll\"" \
+ "ENDIF"
+ qtlibraries.pkg_postrules += qts60plugindeployment
+
sqlitedeployment = \
- "; EXISTS statement does not resolve!. Lets check the most common drives" \
+ "; EXISTS statement does not resolve !. Lets check the most common drives" \
"IF NOT EXISTS(\"c:\\sys\\bin\\sqlite3.dll\") AND NOT EXISTS(\"e:\\sys\\bin\\sqlite3.dll\") AND NOT EXISTS(\"z:\\sys\\bin\\sqlite3.dll\")" \
- "\"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/sqlite3.dll\"-\"!:\\sys\\bin\\sqlite3.dll\"" \
+ "\"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/sqlite3.dll\" - \"!:\\sys\\bin\\sqlite3.dll\"" \
"ENDIF"
- qtlibraries.pkg_postrules = sqlitedeployment
-
+ qtlibraries.pkg_postrules += sqlitedeployment
+
qtlibraries.path = /sys/bin
vendorinfo = \