diff options
| author | axis <qt-info@nokia.com> | 2010-02-16 14:12:49 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-16 14:12:49 (GMT) |
| commit | 6f83ced46abe14725fc6e431d2688abaffb61015 (patch) | |
| tree | de35ee5f388ab3882eae87bb39899da35405710c /src/s60installs | |
| parent | e474d6dfb1aefec60fb0946430090d0476a85e74 (diff) | |
| download | Qt-6f83ced46abe14725fc6e431d2688abaffb61015.zip Qt-6f83ced46abe14725fc6e431d2688abaffb61015.tar.gz Qt-6f83ced46abe14725fc6e431d2688abaffb61015.tar.bz2 | |
Fixed plugin locations in the pkg file.
This broke after commit cfdf813056c5e6063e97bd01266c249ec2f9ecf1.
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/s60installs.pro | 16 |
1 files 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 |