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

4 files changed, 1 insertions, 80 deletions

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 56d2d19..040ca4f 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -3464,9 +3464,6 @@ bool QS60Style::eventFilter(QObject *object, QEvent *event)
 
                 if (d->m_pressedWidget)
                     d->m_pressedWidget->update();
-#ifdef Q_WS_S60
-                d->touchFeedback(event, w);
-#endif
             }
             break;
         }
diff --git a/src/gui/styles/qs60style_feedbackinterface_p.h b/src/gui/styles/qs60style_feedbackinterface_p.h
deleted file mode 100644
index 81fcdc3..0000000
--- a/src/gui/styles/qs60style_feedbackinterface_p.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QObject>
-
-class TactileFeedbackInterface : public QObject
-{
-    public:
-        virtual void touchFeedback(QEvent *event, const QWidget *widget) = 0;
-};
-
-Q_DECLARE_INTERFACE(TactileFeedbackInterface, "com.trolltech.Qt.TactileFeedbackInterface/1.0")
diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h
index db4285d..721fbd9 100644
--- a/src/gui/styles/qs60style_p.h
+++ b/src/gui/styles/qs60style_p.h
@@ -387,7 +387,6 @@ private: //data members
 class QFocusFrame;
 class QProgressBar;
 class QS60StyleAnimation;
-class TactileFeedbackInterface;
 
 // Private class
 #ifdef Q_OS_SYMBIAN
@@ -576,8 +575,6 @@ public:
     void stopAnimation(QS60StyleEnums::SkinParts animation);
     static QS60StyleAnimation* animationDefinition(QS60StyleEnums::SkinParts part);
     static void removeAnimations();
-    //No support for tactile feedback in emulated style
-    void touchFeedback(QEvent *event, const QWidget *widget);
 
 #endif
 
@@ -632,7 +629,6 @@ private:
 #ifdef Q_WS_S60
     //list of progress bars having animation running
     QList<QProgressBar *> m_bars;
-    TactileFeedbackInterface *m_feedbackPlugin;
 #endif
 
 };
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index 92f53ff..4e3f5da 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -50,10 +50,6 @@
 #include "qapplication.h"
 #include "qsettings.h"
 
-#include "qpluginloader.h"
-#include "qlibraryinfo.h"
-#include "private/qs60style_feedbackinterface_p.h"
-
 #include <w32std.h>
 #include <AknsConstants.h>
 #include <aknconsts.h>
@@ -1221,25 +1217,13 @@ void QS60StylePrivate::setActiveLayout()
 
 Q_GLOBAL_STATIC(QList<QS60StyleAnimation *>, m_animations)
 
-QS60StylePrivate::QS60StylePrivate() : m_feedbackPlugin(0)
+QS60StylePrivate::QS60StylePrivate()
 {
     //Animation defaults need to be created when style is instantiated
     QS60StyleAnimation* progressBarAnimation = new QS60StyleAnimation(QS60StyleEnums::SP_QgnGrafBarWaitAnim, 7, 100);
     m_animations()->append(progressBarAnimation);
     // No need to set active layout, if dynamic metrics API is available
     setActiveLayout();
-
-    //Tactile feedback plugin is only available for touch devices.
-    if (isTouchSupported()) {
-        QString pluginsPath = QLibraryInfo::location(QLibraryInfo::PluginsPath);
-        pluginsPath += QLatin1String("/feedback/qtactilefeedback.dll");
-
-        // Create plugin loader
-        QPluginLoader pluginLoader(pluginsPath);
-        // Load plugin and store pointer to the plugin implementation
-        if (pluginLoader.load())
-            m_feedbackPlugin = qobject_cast<TactileFeedbackInterface*>(pluginLoader.instance());
-    }
 }
 
 void QS60StylePrivate::removeAnimations()
@@ -1529,12 +1513,6 @@ void QS60StylePrivate::stopAnimation(QS60StyleEnums::SkinParts animationPart)
     }
 }
 
-void QS60StylePrivate::touchFeedback(QEvent *event, const QWidget *widget)
-{
-    if (m_feedbackPlugin)
-        m_feedbackPlugin->touchFeedback(event, widget);
-}
-
 QVariant QS60StyleModeSpecifics::themeDefinition(
     QS60StyleEnums::ThemeDefinitions definition, QS60StyleEnums::SkinParts part)
 {