diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-12-16 11:41:28 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-12-16 11:41:28 (GMT) |
| commit | c70b1afe694b0d32ece6b639b1e4d10501df8bb0 (patch) | |
| tree | ca3dba942a4579768f9810becbe5e58e0e384808 /src/s60installs | |
| parent | fcdd6eba85ecfe65856bc20910810659a4b5df00 (diff) | |
| download | Qt-c70b1afe694b0d32ece6b639b1e4d10501df8bb0.zip Qt-c70b1afe694b0d32ece6b639b1e4d10501df8bb0.tar.gz Qt-c70b1afe694b0d32ece6b639b1e4d10501df8bb0.tar.bz2 | |
Remove support for automatic tactile feedback from QS60Style
Currently QS60Style loads automatically a plugin to support tactile
feedback for styled applications. However, there is no control over
this, so applications cannot remove the automatic support, if they'd
like to use Mobility APIs to control the feedback themselves.
In order to avoid this, remove tactile feedback plugin from style.
Lets see if we can later put this back with optional enable/disable
flag.
Task-number: QTBUG-16151
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/qt.iby | 5 | ||||
| -rw-r--r-- | src/s60installs/s60installs.pro | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/s60installs/qt.iby b/src/s60installs/qt.iby index 2b3be0a..4afbf05 100644 --- a/src/s60installs/qt.iby +++ b/src/s60installs/qt.iby @@ -60,8 +60,6 @@ file=ABI_DIR\BUILD_DIR\qsymbianbearer.dll SHARED_LIB_DIR\qsymbianbearer.dll // so don't bother including those plugins file=ABI_DIR\BUILD_DIR\qts60plugin_5_0.dll SHARED_LIB_DIR\qts60plugin_5_0.dll -file=ABI_DIR\BUILD_DIR\qtactilefeedback.dll SHARED_LIB_DIR\qtactilefeedback.dll - S60_APP_RESOURCE(s60main) // imageformats stubs @@ -107,9 +105,6 @@ data=\epoc32\data\z\resource\qt\plugins\graphicssystems\qglgraphicssystem.qtplug // bearer stub data=\epoc32\data\z\resource\qt\plugins\bearer\qsymbianbearer.qtplugin resource\qt\plugins\bearer\qsymbianbearer.qtplugin -// feedback -data=\epoc32\data\z\resource\qt\plugins\feedback\qtactilefeedback.qtplugin resource\qt\plugins\feedback\qtactilefeedback.qtplugin - // Stub sis file data=ZSYSTEM\install\qt_stub.sis System\Install\qt_stub.sis data=ZSYSTEM\install\qtwebkit_stub.sis System\Install\qtwebkit_stub.sis diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 5a435cd..be7ed97 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -87,12 +87,6 @@ symbian: { DEPLOYMENT += bearer_plugin } - !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { - feedback_plugin.sources = $$QT_BUILD_TREE/plugins/s60/feedback/qtactilefeedback$${QT_LIBINFIX}.dll - feedback_plugin.path = c:$$QT_PLUGINS_BASE_DIR/feedback - DEPLOYMENT += feedback_plugin - } - qtlibraries.pkg_postrules += qts60plugindeployment qtlibraries.path = c:/sys/bin |