diff options
| author | axis <qt-info@nokia.com> | 2010-02-12 10:03:03 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-12 10:26:12 (GMT) |
| commit | 12b5471062a52f6745f4309568b4c27c5e12d91f (patch) | |
| tree | 48df9322513566518c0b8ea5c3d35d3bb4823797 /src/s60installs | |
| parent | 4b4021443ba06b966c46994eeeceb34dd607bd9b (diff) | |
| download | Qt-12b5471062a52f6745f4309568b4c27c5e12d91f.zip Qt-12b5471062a52f6745f4309568b4c27c5e12d91f.tar.gz Qt-12b5471062a52f6745f4309568b4c27c5e12d91f.tar.bz2 | |
Made some changes after code review.
- Changed makefile generator name to SYMBIAN_UNIX, to be more in line
with the other generators.
- Explained the reason for avoiding virtual inheritance in a bit more
detail.
- Removed an unnecessary string replacement.
- Fixed the location of s60 plugins for MMP based generators.
RevBy: Miikka Heikkinen
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/s60installs.pro | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 8cb7c18..cff8426 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -27,20 +27,24 @@ symbian: { $$QMAKE_LIBDIR_QT/QtSql.dll symbian-abld|symbian-sbsv2 { - pluginLocations = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET) + defineReplace(pluginLocations) { + return ($${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)) + } } else { - pluginLocations = $$QT_BUILD_TREE/src/plugins/s60 + defineReplace(pluginLocations) { + return ($$QT_BUILD_TREE/src/plugins/s60/$$1) + } } qts60plugindeployment = \ "IF package(0x1028315F)" \ - " \"$${pluginLocations}/5_0/qts60plugin_5_0.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0.dll\"" \ + " \"$$pluginLocations(5_0)/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(3_2)/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(3_1)/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(5_0)/qts60plugin_5_0.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0.dll\"" \ "ENDIF" qtlibraries.pkg_postrules += qts60plugindeployment |