summaryrefslogtreecommitdiffstats
path: root/src/s60installs
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-01-07 15:25:13 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-01-07 15:29:25 (GMT)
commit784374ac949ecf2fdc6895908e1e4dfe938931b8 (patch)
treec7be95420349a9285d79b1965c1df3268a166308 /src/s60installs
parente2f2765b52508515874edea7015c01eb95ff89be (diff)
downloadQt-784374ac949ecf2fdc6895908e1e4dfe938931b8.zip
Qt-784374ac949ecf2fdc6895908e1e4dfe938931b8.tar.gz
Qt-784374ac949ecf2fdc6895908e1e4dfe938931b8.tar.bz2
Deploy sqlite3.sis instead of sqlite3.dll in Symbian
Task-number: QTBUG-4879 Reviewed-by: Shane Kearns
Diffstat (limited to 'src/s60installs')
-rw-r--r--src/s60installs/s60installs.pro7
-rw-r--r--src/s60installs/sqlite3.sisbin0 -> 286192 bytes
2 files changed, 3 insertions, 4 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index e024396..eb35419 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -35,10 +35,8 @@ symbian: {
qtlibraries.pkg_postrules += qts60plugindeployment
sqlitedeployment = \
- "; 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\" - \"c:\\sys\\bin\\sqlite3.dll\"" \
- "ENDIF"
+ "; Deploy sqlite onto phone that does not have it already" \
+ "@\"sqlite3.sis\", (0x2002af5f)"
qtlibraries.pkg_postrules += sqlitedeployment
qtlibraries.path = c:/sys/bin
@@ -61,6 +59,7 @@ symbian: {
contains(CONFIG, stl) {
qtlibraries.pkg_prerules += "(0x2000F866), 1, 0, 0, {\"Standard C++ Library Common\"}"
}
+ qtlibraries.pkg_prerules += "(0x2002af5f), 0, 5, 0, {\"sqlite3\"}"
!contains(QT_CONFIG, no-jpeg): imageformats_plugins.sources += qjpeg.dll
!contains(QT_CONFIG, no-gif): imageformats_plugins.sources += qgif.dll
diff --git a/src/s60installs/sqlite3.sis b/src/s60installs/sqlite3.sis
new file mode 100644
index 0000000..1785365
--- /dev/null
+++ b/src/s60installs/sqlite3.sis
Binary files differ