summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-04-06 13:40:54 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-04-06 13:41:14 (GMT)
commit443f8e21b8217d80fa323d20ec163df5a3adcbc0 (patch)
tree35dd1606eb679b905a457b7025cbae2e22b2ccfd
parent1a4f72da5aefa92b2bb78cf1ff96c34d7c3c303c (diff)
downloadQt-443f8e21b8217d80fa323d20ec163df5a3adcbc0.zip
Qt-443f8e21b8217d80fa323d20ec163df5a3adcbc0.tar.gz
Qt-443f8e21b8217d80fa323d20ec163df5a3adcbc0.tar.bz2
Fix 'make sis' working on symbian makefile based system again.
Only use EPOCROOT as the source for libs on symbian-abld|symbian-sbsv2
-rw-r--r--src/s60installs/s60installs.pro12
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