summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Kearns <shane.kearns@sosco.com>2009-10-28 08:15:40 (GMT)
committerShane Kearns <shane.kearns@sosco.com>2009-10-28 08:15:40 (GMT)
commitcabbff076f40eeeb56beb53220a40f124a2e0215 (patch)
tree017d9e8a4d9df2e726293887d9088f21aec76b2f
parent6bc9ef388590b4bfb281d2e1510dc7c3d1837349 (diff)
downloadQt-cabbff076f40eeeb56beb53220a40f124a2e0215.zip
Qt-cabbff076f40eeeb56beb53220a40f124a2e0215.tar.gz
Qt-cabbff076f40eeeb56beb53220a40f124a2e0215.tar.bz2
Change deployment of SQLite to check for stub SIS file
This is less wrong than searching for a file name on specific drives. Correct solution is to use an embedded SIS file dependency, for that we need to get a symbian-signed sis file from the symbian OS team. Reviewed-by: Miikka Heikkinen
-rw-r--r--src/s60installs/s60installs.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 7233e8a..f553598 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -35,8 +35,8 @@ symbian: {
qtlibraries.pkg_postrules += qts60plugindeployment
sqlitedeployment = \
- "; 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\")" \
+ "; Deploy sqlite onto phone that does not have it (this should be replaced with embedded sis file when available)
+ "IF NOT package(0x2002533b) " \
"\"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/sqlite3.dll\" - \"!:\\sys\\bin\\sqlite3.dll\"" \
"ENDIF"
qtlibraries.pkg_postrules += sqlitedeployment