From 6ff8405b4ab06c58a9ce0b4bdd7449f38b97ba48 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 16 Feb 2010 13:15:20 +0100 Subject: Removed file templates no longer needed after pkg generator was impl. --- templates/pkg_template.pkg | 28 ---------------------------- templates/wiggly.rsc | Bin 93 -> 0 bytes templates/wiggly_reg.rsc | Bin 103 -> 0 bytes 3 files changed, 28 deletions(-) delete mode 100644 templates/pkg_template.pkg delete mode 100644 templates/wiggly.rsc delete mode 100644 templates/wiggly_reg.rsc 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 Binary files a/templates/wiggly.rsc and /dev/null differ diff --git a/templates/wiggly_reg.rsc b/templates/wiggly_reg.rsc deleted file mode 100644 index 6f52a2c..0000000 Binary files a/templates/wiggly_reg.rsc and /dev/null differ -- cgit v0.12 From e474d6dfb1aefec60fb0946430090d0476a85e74 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 16 Feb 2010 15:09:06 +0100 Subject: Fixed location of dll on Symbian after QtMultimedia was added. --- src/s60installs/s60installs.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index c5d5830..351da5e 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -129,7 +129,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)" -- cgit v0.12 From 6f83ced46abe14725fc6e431d2688abaffb61015 Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 16 Feb 2010 15:12:49 +0100 Subject: Fixed plugin locations in the pkg file. This broke after commit cfdf813056c5e6063e97bd01266c249ec2f9ecf1. --- src/s60installs/s60installs.pro | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 351da5e..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 -- cgit v0.12