4 files changed, 13 insertions, 9 deletions
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
+}