Fix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.

- Remove QDeclarative compatibility module code.
- Remove remains of Symbian.

Change-Id: Ib24c0c027c899e7eb30b3c8550a483d0d8b2b77f
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

4 files changed, 11 insertions, 24 deletions

diff --git a/src/imports/feedback/feedback.pro b/src/imports/feedback/feedback.pro
index 80fd78e..441b84e 100644
--- a/src/imports/feedback/feedback.pro
+++ b/src/imports/feedback/feedback.pro
@@ -11,7 +11,7 @@ pluginTypes.files += $$PWD/plugins.qmltypes
 pluginTypes.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 INSTALLS += qmldir pluginTypes
 
-QT += declarative feedback
+QT += qml feedback
 
 HEADERS += qdeclarativehapticseffect_p.h \
            qdeclarativefileeffect_p.h \
@@ -25,16 +25,3 @@ SOURCES += qdeclarativehapticseffect.cpp \
            qdeclarativethemeeffect.cpp \
            qdeclarativefeedbackactuator.cpp \
            qdeclarativefeedbackeffect.cpp
-
-symbian {
-    # In Symbian, a library should enjoy _largest_ possible capability set.
-    TARGET.CAPABILITY = ALL -TCB
-    # Allow writable DLL data
-    TARGET.EPOCALLOWDLLDATA = 1
-    # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x200315FC
-    # Specifies what files shall be deployed: the plugin itself and the qmldir file.
-    importFiles.sources = $$DESTDIR/declarative_feedback$${QT_LIBINFIX}.dll qmldir
-    importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
-    DEPLOYMENT = importFiles
-}
diff --git a/src/imports/feedback/plugin.cpp b/src/imports/feedback/plugin.cpp
index 94f44ca..34a1d18 100644
--- a/src/imports/feedback/plugin.cpp
+++ b/src/imports/feedback/plugin.cpp
@@ -49,7 +49,7 @@
 
 QT_USE_NAMESPACE
 
-static QObject *createDeclarativeThemeEfect(QDeclarativeEngine *engine, QJSEngine *jsengine)
+static QObject *createDeclarativeThemeEfect(QQmlEngine *engine, QJSEngine *jsengine)
 {
     Q_UNUSED(engine)
     Q_UNUSED(jsengine)
@@ -57,7 +57,7 @@ static QObject *createDeclarativeThemeEfect(QDeclarativeEngine *engine, QJSEngin
     return new QDeclarativeThemeEffect;
 }
 
-class QDeclarativeFeedbackPlugin : public QDeclarativeExtensionPlugin
+class QDeclarativeFeedbackPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json")
diff --git a/src/imports/feedback/qdeclarativehapticseffect.cpp b/src/imports/feedback/qdeclarativehapticseffect.cpp
index a32d43b..2d409ea 100644
--- a/src/imports/feedback/qdeclarativehapticseffect.cpp
+++ b/src/imports/feedback/qdeclarativehapticseffect.cpp
@@ -221,8 +221,8 @@ QDeclarativeFeedbackActuator* QDeclarativeHapticsEffect::actuator() const
     This property is read only.
     \sa Actuator
 */
-QDeclarativeListProperty<QDeclarativeFeedbackActuator> QDeclarativeHapticsEffect::availableActuators() {
-    return QDeclarativeListProperty<QDeclarativeFeedbackActuator>(this,
+QQmlListProperty<QDeclarativeFeedbackActuator> QDeclarativeHapticsEffect::availableActuators() {
+    return QQmlListProperty<QDeclarativeFeedbackActuator>(this,
                                                                   0,
                                                                   0 /*appending actuators are not allowed*/,
                                                                   actuator_count,
@@ -230,11 +230,11 @@ QDeclarativeListProperty<QDeclarativeFeedbackActuator> QDeclarativeHapticsEffect
                                                                   0 /*removing actuators are not allowed*/);
 }
 
-int QDeclarativeHapticsEffect::actuator_count(QDeclarativeListProperty<QDeclarativeFeedbackActuator> *prop)
+int QDeclarativeHapticsEffect::actuator_count(QQmlListProperty<QDeclarativeFeedbackActuator> *prop)
 {
     return static_cast<QDeclarativeHapticsEffect*>(prop->object)->m_actuators.size();
 }
-QDeclarativeFeedbackActuator* QDeclarativeHapticsEffect::actuator_at(QDeclarativeListProperty<QDeclarativeFeedbackActuator> *prop, int index)
+QDeclarativeFeedbackActuator* QDeclarativeHapticsEffect::actuator_at(QQmlListProperty<QDeclarativeFeedbackActuator> *prop, int index)
 {
     return static_cast<QDeclarativeHapticsEffect*>(prop->object)->m_actuators.at(index);
 }
diff --git a/src/imports/feedback/qdeclarativehapticseffect_p.h b/src/imports/feedback/qdeclarativehapticseffect_p.h
index 8737c95..071a426 100644
--- a/src/imports/feedback/qdeclarativehapticseffect_p.h
+++ b/src/imports/feedback/qdeclarativehapticseffect_p.h
@@ -63,7 +63,7 @@ class QDeclarativeHapticsEffect : public QDeclarativeFeedbackEffect
 {
     Q_OBJECT
 
-    Q_PROPERTY(QDeclarativeListProperty<QDeclarativeFeedbackActuator> availableActuators READ availableActuators)
+    Q_PROPERTY(QQmlListProperty<QDeclarativeFeedbackActuator> availableActuators READ availableActuators)
     Q_PROPERTY(qreal intensity READ intensity WRITE setIntensity NOTIFY intensityChanged)
     Q_PROPERTY(int attackTime READ attackTime WRITE setAttackTime NOTIFY attackTimeChanged)
     Q_PROPERTY(qreal attackIntensity READ attackIntensity WRITE setAttackIntensity NOTIFY attackIntensityChanged)
@@ -92,9 +92,9 @@ public:
     int period() const;
     void setActuator(QDeclarativeFeedbackActuator *actuator);
     QDeclarativeFeedbackActuator* actuator() const;
-    QDeclarativeListProperty<QDeclarativeFeedbackActuator> availableActuators();
-    static int actuator_count(QDeclarativeListProperty<QDeclarativeFeedbackActuator> *prop);
-    static QDeclarativeFeedbackActuator *actuator_at(QDeclarativeListProperty<QDeclarativeFeedbackActuator> *prop, int index);
+    QQmlListProperty<QDeclarativeFeedbackActuator> availableActuators();
+    static int actuator_count(QQmlListProperty<QDeclarativeFeedbackActuator> *prop);
+    static QDeclarativeFeedbackActuator *actuator_at(QQmlListProperty<QDeclarativeFeedbackActuator> *prop, int index);
 
 signals:
     void intensityChanged();