diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-01-07 15:25:13 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-01-11 12:20:22 (GMT) |
| commit | 1cbeaad30b5b0c718c6cc61e2c51b5d5ab7978de (patch) | |
| tree | 4e7cbe856282afd2e84730c5470ecbf2577dd6c1 | |
| parent | d1179ad96427accf2b25c5618d999c5fe511d982 (diff) | |
| download | Qt-1cbeaad30b5b0c718c6cc61e2c51b5d5ab7978de.zip Qt-1cbeaad30b5b0c718c6cc61e2c51b5d5ab7978de.tar.gz Qt-1cbeaad30b5b0c718c6cc61e2c51b5d5ab7978de.tar.bz2 | |
Deploy sqlite3.sis instead of sqlite3.dll in Symbian
Task-number: QTBUG-4879
Reviewed-by: Shane Kearns
(cherry picked from commit 784374ac949ecf2fdc6895908e1e4dfe938931b8)
| -rw-r--r-- | src/s60installs/s60installs.pro | 7 | ||||
| -rw-r--r-- | src/s60installs/sqlite3.sis | bin | 0 -> 286192 bytes |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 6842af8..0184675 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 Binary files differnew file mode 100644 index 0000000..1785365 --- /dev/null +++ b/src/s60installs/sqlite3.sis |