9 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/feedback/immersion/immersion.json b/src/plugins/feedback/immersion/immersion.json
new file mode 100644
index 0000000..3f32701
--- /dev/null
+++ b/src/plugins/feedback/immersion/immersion.json
@@ -0,0 +1 @@
+{ "Interfaces": [ "QFeedbackHapticsInterface", "QFeedbackFileInterface" ] }
diff --git a/src/plugins/feedback/immersion/qfeedback.cpp b/src/plugins/feedback/immersion/qfeedback.cpp
index 437627c..49db699 100644
--- a/src/plugins/feedback/immersion/qfeedback.cpp
+++ b/src/plugins/feedback/immersion/qfeedback.cpp
@@ -52,8 +52,6 @@
 
 #define MAX_FILE_SIZE (1 << 14) //16KB
 
-Q_EXPORT_PLUGIN2(feedback_immersion, QFeedbackImmersion)
-
 QFeedbackImmersion::QFeedbackImmersion() : QObject(qApp)
 {
     if (VIBE_FAILED(ImmVibeInitialize(VIBE_CURRENT_VERSION_NUMBER))) {
diff --git a/src/plugins/feedback/immersion/qfeedback.h b/src/plugins/feedback/immersion/qfeedback.h
index adaadee..aeb0054 100644
--- a/src/plugins/feedback/immersion/qfeedback.h
+++ b/src/plugins/feedback/immersion/qfeedback.h
@@ -71,6 +71,7 @@ QT_USE_NAMESPACE
 class QFeedbackImmersion : public QObject, public QFeedbackHapticsInterface, public QFeedbackFileInterface
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtFeedbackPlugin" FILE "immersion.json")
 
     Q_INTERFACES(QTM_NAMESPACE::QFeedbackHapticsInterface)
     Q_INTERFACES(QTM_NAMESPACE::QFeedbackFileInterface)
diff --git a/src/plugins/feedback/meegotouch/meegotouch.json b/src/plugins/feedback/meegotouch/meegotouch.json
new file mode 100644
index 0000000..51f3728
--- /dev/null
+++ b/src/plugins/feedback/meegotouch/meegotouch.json
@@ -0,0 +1 @@
+{ "Interfaces": [ "QFeedbackThemeInterface" ] }
diff --git a/src/plugins/feedback/meegotouch/qfeedback.cpp b/src/plugins/feedback/meegotouch/qfeedback.cpp
index 7259525..bc237e1 100644
--- a/src/plugins/feedback/meegotouch/qfeedback.cpp
+++ b/src/plugins/feedback/meegotouch/qfeedback.cpp
@@ -46,8 +46,6 @@
 
 #include <meegotouch/MFeedback>
 
-Q_EXPORT_PLUGIN2(feedback_meegotouch, QFeedbackMeegoTouch)
-
 // TODO Use a style property based enum to play the correct feedback
 //enum MeegoTouchFeedback
 //{
diff --git a/src/plugins/feedback/meegotouch/qfeedback.h b/src/plugins/feedback/meegotouch/qfeedback.h
index 3c9be8d..716dde6 100644
--- a/src/plugins/feedback/meegotouch/qfeedback.h
+++ b/src/plugins/feedback/meegotouch/qfeedback.h
@@ -48,6 +48,7 @@ QT_BEGIN_HEADER
 
 class QFeedbackMeegoTouch : public QObject, public QFeedbackThemeInterface {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtFeedbackPlugin" FILE "meegotouch.json")
     Q_INTERFACES(QFeedbackThemeInterface)
 public:
     QFeedbackMeegoTouch(QObject *parent = 0);
diff --git a/src/plugins/feedback/mmk/mmk.json b/src/plugins/feedback/mmk/mmk.json
new file mode 100644
index 0000000..7c20958
--- /dev/null
+++ b/src/plugins/feedback/mmk/mmk.json
@@ -0,0 +1 @@
+{ "Interfaces": [ "QFeedbackFileInterface" ] }
diff --git a/src/plugins/feedback/mmk/qfeedback.cpp b/src/plugins/feedback/mmk/qfeedback.cpp
index 4c2c10b..92b28f8 100644
--- a/src/plugins/feedback/mmk/qfeedback.cpp
+++ b/src/plugins/feedback/mmk/qfeedback.cpp
@@ -48,8 +48,6 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_EXPORT_PLUGIN2(feedback_mmk, QFeedbackMMK)
-
 QFeedbackMMK::QFeedbackMMK() : QObject(qApp)
 {
 }
diff --git a/src/plugins/feedback/mmk/qfeedback.h b/src/plugins/feedback/mmk/qfeedback.h
index 81c6064..588c262 100644
--- a/src/plugins/feedback/mmk/qfeedback.h
+++ b/src/plugins/feedback/mmk/qfeedback.h
@@ -56,6 +56,7 @@ class QFeedbackMediaObject;
 class QFeedbackMMK : public QObject, public QFeedbackFileInterface
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtFeedbackPlugin" FILE "mmk.json")
     Q_INTERFACES(QFeedbackFileInterface)
 
 public: