Skip to content

Commit

Permalink
Fix qt.sis platform dependencies for Symbian^3 builds.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Miikka Heikkinen committed Feb 2, 2011
1 parent 5b89e67 commit cf2f232
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/s60installs/s60installs.pro
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,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
Expand Down Expand Up @@ -183,10 +189,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) {
Expand Down

0 comments on commit cf2f232

Please sign in to comment.