diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-02-02 13:58:14 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-02-04 14:27:49 (GMT) |
| commit | fc0ab9369ebb72342c8b59b715325b3b31a6cbbf (patch) | |
| tree | 53e3bb51c9a99d5bf07f7cc1e4994fdcae1fd2c4 | |
| parent | b6525589d82098e5e83fae44a050751da71a33ed (diff) | |
| download | Qt-fc0ab9369ebb72342c8b59b715325b3b31a6cbbf.zip Qt-fc0ab9369ebb72342c8b59b715325b3b31a6cbbf.tar.gz Qt-fc0ab9369ebb72342c8b59b715325b3b31a6cbbf.tar.bz2 | |
Fix qt.sis platform dependencies for Symbian^3 builds.
Symbian^3 build of qt.sis is not compatible with pre-Symbian^3
devices, so remove the platform dependencies to said devices.
Task-number: QTBUG-17150
Reviewed-by: Janne Koskinen
(cherry picked from commit cf2f23225414893a7b061fadbde4739165f0c554)
| -rw-r--r-- | src/s60installs/s60installs.pro | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index be7ed97..7cd0377 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -78,13 +78,19 @@ symbian: { "ENDIF" \ " \"$$bearerStubZ\" - \"c:$$replace(QT_PLUGINS_BASE_DIR,/,\\)\\bearer\\qsymbianbearer$${QT_LIBINFIX}.qtplugin\" } else { + # Restrict deployment to Symbian3 and later platforms + default_deployment.pkg_prerules -= pkg_platform_dependencies + platform_dependency_rules.pkg_prerules = \ + "[0x20022E6D],0,0,0,{\"S60ProductID\"}" \ + "[0x20032DE7],0,0,0,{\"S60ProductID\"}" + # No need to deploy plugins for older platform versions when building on Symbian3 or later qts60plugindeployment = \ " \"$$pluginLocations/qts60plugin_5_0$${QT_LIBINFIX}.dll\" - \"c:\\sys\\bin\\qts60plugin_5_0$${QT_LIBINFIX}.dll\"" bearer_plugin.sources = $$QT_BUILD_TREE/plugins/bearer/qsymbianbearer$${QT_LIBINFIX}.dll bearer_plugin.path = c:$$QT_PLUGINS_BASE_DIR/bearer - DEPLOYMENT += bearer_plugin + DEPLOYMENT += bearer_plugin platform_dependency_rules } qtlibraries.pkg_postrules += qts60plugindeployment @@ -184,10 +190,6 @@ symbian: { contains(QT_CONFIG, openvg) { qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtOpenVG$${QT_LIBINFIX}.dll graphicssystems_plugins.sources += $$QT_BUILD_TREE/plugins/graphicssystems/qvggraphicssystem$${QT_LIBINFIX}.dll - # OpenVG requires Symbian^3 or later - pkg_platform_dependencies = \ - "[0x20022E6D],0,0,0,{\"S60ProductID\"}" \ - "[0x20032DE7],0,0,0,{\"S60ProductID\"}" } contains(QT_CONFIG, opengl) { |