diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 20:46:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 20:46:12 (GMT) |
| commit | db13e3817058ada45a4bc68fd438b495eb915c8d (patch) | |
| tree | 74fa0102fc5d9781755a83a089210b104f34b141 /src | |
| parent | c768371b6b7d7de8d758079b7e5d82226e9f5798 (diff) | |
| parent | 1bb3af5ee4fdd39f553ef3005944578c24350607 (diff) | |
| download | Qt-db13e3817058ada45a4bc68fd438b495eb915c8d.zip Qt-db13e3817058ada45a4bc68fd438b495eb915c8d.tar.gz Qt-db13e3817058ada45a4bc68fd438b495eb915c8d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix 'make sis' working on symbian makefile based system again.
Make shipped symbian scripts available from the build-dir bin dir.
Diffstat (limited to 'src')
| -rw-r--r-- | src/s60installs/s60installs.pro | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index ffd15e6..dfce7d2 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -16,9 +16,15 @@ symbian: { BLD_INF_RULES.prj_exports += \ "sqlite3.sis $${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis" \ "sqlite3_selfsigned.sis $${EPOCROOT}epoc32/data/qt/sis/sqlite3_selfsigned.sis" - sqlitedeployment = \ - "; Deploy sqlite onto phone that does not have it already" \ - "@\"$${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis\", (0x2002af5f)" + 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 |