diff options
| author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-02-17 15:52:18 (GMT) |
|---|---|---|
| committer | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-02-17 15:52:18 (GMT) |
| commit | 3196c9e64dc3d966547bd0b38c440e55eb913479 (patch) | |
| tree | 3363dac9eaa763aef5e5fd41a2270712690ca16e /src/s60installs | |
| parent | a8a84f1667966acfa093c4be0b7d4b0900ddd3d9 (diff) | |
| parent | 924bcf1ccd9d25484fda8b8d68b8de7744a4693e (diff) | |
| download | Qt-3196c9e64dc3d966547bd0b38c440e55eb913479.zip Qt-3196c9e64dc3d966547bd0b38c440e55eb913479.tar.gz Qt-3196c9e64dc3d966547bd0b38c440e55eb913479.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/s60installs.pro | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 98a9ea9..1e5ce0f 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 |