diff options
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | src/s60installs/s60installs.pro | 12 |
2 files changed, 20 insertions, 3 deletions
@@ -2315,6 +2315,17 @@ if [ "$OPT_SHADOW" = "yes" ]; then chmod 755 "$outpath/bin/syncqt" fi + for i in createpackage patch_capabilities; do + rm -f "$outpath/bin/$i" + if [ -x "$relpath/bin/$i" ]; then + mkdir -p "$outpath/bin" + echo "#!/bin/sh" >"$outpath/bin/$i" + echo "QTDIR=\"$relpath\"; export QTDIR" >>"$outpath/bin/$i" + echo "\"$relpath/bin/$i\" \"\$@\"" >>"$outpath/bin/$i" + chmod 755 "$outpath/bin/$i" + fi + done + # symlink the mkspecs directory mkdir -p "$outpath/mkspecs" rm -f "$outpath"/mkspecs/* 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 |