4 files changed, 7 insertions, 39 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index c5d5830..0f96d0e 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -27,24 +27,20 @@ symbian: {
         $$QMAKE_LIBDIR_QT/QtSql.dll
 
     symbian-abld|symbian-sbsv2 {
-        defineReplace(pluginLocations) {
-            return ($${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET))
-        }
+        pluginLocations = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)
     } else {
-        defineReplace(pluginLocations) {
-            return ($$QT_BUILD_TREE/plugins/s60/$$1)
-        }
+        pluginLocations = $$QT_BUILD_TREE/plugins/s60
     }
 
     qts60plugindeployment = \
         "IF package(0x1028315F)" \
-        "   \"$$pluginLocations(5_0)/qts60plugin_5_0.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0.dll\"" \
+        "   \"$$pluginLocations/qts60plugin_5_0.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0.dll\"" \
         "ELSEIF package(0x102752AE)" \
-        "   \"$$pluginLocations(3_2)/qts60plugin_3_2.dll\" - \"c:\\sys\\bin\\qts60plugin_3_2.dll\"" \
+        "   \"$$pluginLocations/qts60plugin_3_2.dll\" - \"c:\\sys\\bin\\qts60plugin_3_2.dll\"" \
         "ELSEIF package(0x102032BE)" \
-        "   \"$$pluginLocations(3_1)/qts60plugin_3_1.dll\" - \"c:\\sys\\bin\\qts60plugin_3_1.dll\"" \
+        "   \"$$pluginLocations/qts60plugin_3_1.dll\" - \"c:\\sys\\bin\\qts60plugin_3_1.dll\"" \
         "ELSE" \
-        "   \"$$pluginLocations(5_0)/qts60plugin_5_0.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0.dll\"" \
+        "   \"$$pluginLocations/qts60plugin_5_0.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0.dll\"" \
         "ENDIF"
     qtlibraries.pkg_postrules += qts60plugindeployment
 
@@ -129,7 +125,7 @@ symbian: {
     }
 
     contains(QT_CONFIG, multimedia) {
-        qtlibraries.sources += QtMultimedia.dll
+        qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtMultimedia.dll
     }
 
     BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
diff --git a/templates/pkg_template.pkg b/templates/pkg_template.pkg
deleted file mode 100644
index 955ab49..0000000
--- a/templates/pkg_template.pkg
+++ /dev/null
@@ -1,28 +0,0 @@
-; Language
-&EN
-
-; SIS header: name, uid, version
-#{"MyApp"},(0xE001e45e),1,0,0
-
-; Localised Vendor name
-%{"Vendor"}
-
-; Unique Vendor name
-:"Vendor"
-
-; Manual PKG pre-rules from PRO files
-; Default HW/platform dependencies
-[0x101F7961],0,0,0,{"S60ProductID"}
-[0x102032BE],0,0,0,{"S60ProductID"}
-[0x102752AE],0,0,0,{"S60ProductID"}
-[0x1028315F],0,0,0,{"S60ProductID"}
- 
-; Executable and default resource files
-"wiggly.exe"    - "!:\sys\bin\wiggly.exe"
-"QtCore.dll"   - "!:\sys\bin\QtCore.dll"
-"QtGui.dll"    - "!:\sys\bin\QtGui.dll"
-; Currently you need to get this from a Windows build, but there are some
-; precompiled ones in this directory for testing.
-"../src/gui/.rcc/debug-shared/s60main.rsc"    - "!:\resource\apps\s60main.rsc"
-"wiggly.rsc"    - "!:\resource\apps\wiggly.rsc"
-"wiggly_reg.rsc"    - "!:\private\10003a3f\import\apps\wiggly_reg.rsc"
diff --git a/templates/wiggly.rsc b/templates/wiggly.rsc
deleted file mode 100644
index cb487c3..0000000
--- a/templates/wiggly.rsc
+++ /dev/null
diff --git a/templates/wiggly_reg.rsc b/templates/wiggly_reg.rsc
deleted file mode 100644
index 6f52a2c..0000000
--- a/templates/wiggly_reg.rsc
+++ /dev/null