diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-17 16:05:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-17 16:05:53 (GMT) |
| commit | 6796df2c4cbfa658d563a0786b4ba83597247b8d (patch) | |
| tree | 1472bbc384dd14c9346e60ececd9a8df13e48de2 /src | |
| parent | 57f2c8b9bd3a7cfd0e1f9636880cb9a6130da885 (diff) | |
| parent | 70dd3d2dcde08530a4a6ab62675406e03c8981f0 (diff) | |
| download | Qt-6796df2c4cbfa658d563a0786b4ba83597247b8d.zip Qt-6796df2c4cbfa658d563a0786b4ba83597247b8d.tar.gz Qt-6796df2c4cbfa658d563a0786b4ba83597247b8d.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src')
| -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 0a2f614..741a5fc 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 |