summaryrefslogtreecommitdiffstats
path: root/src/s60installs
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-02-17 10:15:48 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2011-02-17 10:45:29 (GMT)
commit924bcf1ccd9d25484fda8b8d68b8de7744a4693e (patch)
tree5fc3335e5a08370f4b4d3cbe2744cfd917178cb5 /src/s60installs
parent48e7ac0eee8beb9d2c597ff5fa3c913d56ffb9b0 (diff)
downloadQt-924bcf1ccd9d25484fda8b8d68b8de7744a4693e.zip
Qt-924bcf1ccd9d25484fda8b8d68b8de7744a4693e.tar.gz
Qt-924bcf1ccd9d25484fda8b8d68b8de7744a4693e.tar.bz2
Remove sqlite3.sis from qt.sis.
Nokia Content Signing doesn't like embedded sis packages, so remove the embedded sqlite3.sis from qt.sis. It must now be installed separately just like Open C packages. Task-number: QTBUG-17399 Reviewed-by: axis
Diffstat (limited to 'src/s60installs')
-rw-r--r--src/s60installs/s60installs.pro17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index c282b1e..43cfd6b 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -11,23 +11,6 @@ symbian: {
isEmpty(QT_LIBINFIX) {
TARGET.UID3 = 0x2001E61C
-
- # Sqlite3 is expected to be already found on phone if infixed configuration is built.
- # It is also expected that devices newer than those based on S60 5.0 all have sqlite3.dll.
- contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
- BLD_INF_RULES.prj_exports += \
- "sqlite3.sis /epoc32/data/qt/sis/sqlite3.sis"
- symbian-abld|symbian-sbsv2 {
- sqlitedeployment = \
- "; Deploy sqlite onto phone that does not have it already" \
- "@\"$${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis\", (0x2002af5f)"
- } else {
- sqlitedeployment = \
- "; Deploy sqlite onto phone that does not have it already" \
- "@\"$${PWD}/sqlite3.sis\", (0x2002af5f)"
- }
- qtlibraries.pkg_postrules += sqlitedeployment
- }
} else {
# Always use experimental UID for infixed configuration to avoid UID clash
TARGET.UID3 = 0xE001E61C