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: (25 commits)
  Freetype is not used on symbian, don't use it.
  Disable compiling unsupported classes for Symbian
  Make the 'freeze' target work for linux/symbian.
  Update QtDeclarative .def files for 4.7
  Improve virtual mouse on E72 optical joystick
  Fix build break in Symbian
  Set edit focus to proper control in flightinfo demo
  Update symbian def files for 4.7
  Do not autopatch <app>_installer.pkg when self-signing
  Fix pkg_prerules handling for installer packages
  Fix weatherinfo and flightinfo to only request WLAN connection once
  Fix 'chapter5_plugins.dll.sym contains initialized writable data'
  Fix generation of stub sis files
  Fix SRCDIR and DEPLOYMENT usage in declarative benchmarks
  Shadow building on Symbian fixes: part 3 - unchanged source tree
  Shadow building on Symbian fixes: part 2 - populate bin dir correctly
  Shadow building on Symbian fixes: part 1 - files to right place
  Re-enable suppression of --export_all_vtbl for static libraries
  Omit building declarative/painting benchmark if no OpenGL configured
  Fix requires keyword handling in qmake in Symbian
  ...

5 files changed, 14 insertions, 9 deletions

diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf
index 2397c96..66b3d7f 100644
--- a/mkspecs/common/symbian/symbian-makefile.conf
+++ b/mkspecs/common/symbian/symbian-makefile.conf
@@ -26,6 +26,7 @@ include(../../common/unix.conf)
 QMAKE_PREFIX_SHLIB    =
 QMAKE_EXTENSION_SHLIB = dll
 CONFIG *= no_plugin_name_prefix
+CONFIG += run_on_phone
 QMAKE_EXTENSION_PLUGIN = dll
 QMAKE_PREFIX_STATICLIB =
 QMAKE_EXTENSION_STATICLIB = lib
diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf
index 7d70fc6..da2d250 100644
--- a/mkspecs/features/sis_targets.prf
+++ b/mkspecs/features/sis_targets.prf
@@ -59,7 +59,7 @@ contains(TEMPLATE, app)|!count(DEPLOYMENT, 1) {
                                    )
 
         ok_stub_sis_target.target = ok_stub_sis
-        ok_stub_sis_target.commands = createpackage.bat -s $(QT_SIS_OPTIONS) $$basename(TARGET)_template.pkg \
+        ok_stub_sis_target.commands = createpackage.bat -s $(QT_SIS_OPTIONS) $$basename(TARGET)_stub.pkg \
                                           $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
 
         QMAKE_EXTRA_TARGETS += sis_target \
diff --git a/mkspecs/features/static.prf b/mkspecs/features/static.prf
index ef3af07..288852d 100644
--- a/mkspecs/features/static.prf
+++ b/mkspecs/features/static.prf
@@ -11,9 +11,4 @@ mac {
     QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
 }
 
-symbian {
-    # we don't care about exports from static libraries, as they don't end up in DEF files
-    MMP_RULES -= $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
-}
-
 !static_and_shared:fix_output_dirs:fixExclusiveOutputDirs(static, shared)
diff --git a/mkspecs/features/symbian/def_files.prf b/mkspecs/features/symbian/def_files.prf
index a1f0c8d..8bcd096 100644
--- a/mkspecs/features/symbian/def_files.prf
+++ b/mkspecs/features/symbian/def_files.prf
@@ -64,14 +64,14 @@ symbian-abld|symbian-sbsv2 {
     freeze_target.depends = first
     # The perl part is to convert to unix line endings and remove comments, which the s60 tools refuse to do.
     freeze_target.commands = perl -n -e \'next if (/; NEW/); s/\r//g; if (/MISSING:(.*)/x) { print(\"\$\$1 ABSENT\\n\"); } else { print; }\' < $$symbianObjdir/$${TARGET}.def >  $$elf2e32FileToAdd
-    #QMAKE_EXTRA_TARGETS += freeze_target
+    QMAKE_EXTRA_TARGETS += freeze_target
 } else:contains(TEMPLATE, subdirs) {
     freeze_target.target = freeze
     freeze_target.CONFIG = recursive
     freeze_target.recurse = $$SUBDIRS
-    #QMAKE_EXTRA_TARGETS += freeze_target
+    QMAKE_EXTRA_TARGETS += freeze_target
 } else {
     freeze_target.target = freeze
     freeze_target.commands =
-    #QMAKE_EXTRA_TARGETS += freeze_target
+    QMAKE_EXTRA_TARGETS += freeze_target
 }
diff --git a/mkspecs/features/symbian/run_on_phone.prf b/mkspecs/features/symbian/run_on_phone.prf
new file mode 100644
index 0000000..c4c7baf
--- /dev/null
+++ b/mkspecs/features/symbian/run_on_phone.prf
@@ -0,0 +1,9 @@
+# make sure we have a sis file and then call 'runonphone' to execute it on the phone
+
+contains(TEMPLATE, app) {
+    run_target.target = runonphone
+    run_target.depends = sis
+    run_target.commands = runonphone $(QT_RUN_ON_PHONE_OPTIONS) --sis "$${sis_destdir}$${TARGET}.sis" "$${TARGET}.exe" $(QT_RUN_OPTIONS)
+
+    QMAKE_EXTRA_TARGETS += run_target
+}