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 build error in QtGui armv5 udeb
  Updated qtbench to build against modified QStaticText API
  Make compiling / linking a non-qt app work too on symbian/gcce
  When on Symbian use smaller files.
  Fixing the missing "\\"
  The cmd line arguments have not been delegated properly.
  Clear QFontCache TLS content before nullifying TLS pointer.
  Add --download option to runonphone
  Implement download support to TRK Launcher
  Fix library creation on symbian/gcce
  Update Symbian def files for 4.7
  Various fixes for symbian/gcce building.
  Make encoding clear
  Fix 'make sis' working on symbian makefile based system again.
  Make shipped symbian scripts available from the build-dir bin dir.

1 files changed, 11 insertions, 0 deletions

diff --git a/configure b/configure
index 0dbf98f..30bc564 100755
--- a/configure
+++ b/configure
@@ -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/*