15 files changed, 14 insertions, 10 deletions
diff --git a/src/3rdparty/phonon/ds9/backend.cpp b/src/3rdparty/phonon/ds9/backend.cpp
index fbc4bdc..c14aa7d 100644
--- a/src/3rdparty/phonon/ds9/backend.cpp
+++ b/src/3rdparty/phonon/ds9/backend.cpp
@@ -35,8 +35,6 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 QT_BEGIN_NAMESPACE
 
-Q_EXPORT_PLUGIN2(phonon_ds9, Phonon::DS9::Backend);
-
 namespace Phonon
 {
     namespace DS9
diff --git a/src/3rdparty/phonon/ds9/backend.h b/src/3rdparty/phonon/ds9/backend.h
index 7c3c109..75a65f8 100644
--- a/src/3rdparty/phonon/ds9/backend.h
+++ b/src/3rdparty/phonon/ds9/backend.h
@@ -42,7 +42,9 @@ namespace Phonon
         class Backend : public QObject, public Phonon::BackendInterface
         {
             Q_OBJECT
-                Q_INTERFACES(Phonon::BackendInterface)
+            Q_INTERFACES(Phonon::BackendInterface)
+            Q_PLUGIN_METADATA(IID "BackendInterface3.phonon.kde.org" FILE "ds9.json")
+
         public:
             Backend(QObject *parent = 0, const QVariantList & = QVariantList());
             virtual ~Backend();
diff --git a/src/3rdparty/phonon/ds9/ds9.json b/src/3rdparty/phonon/ds9/ds9.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/src/3rdparty/phonon/ds9/ds9.json
@@ -0,0 +1 @@
+{}
diff --git a/src/3rdparty/phonon/gstreamer/backend.cpp b/src/3rdparty/phonon/gstreamer/backend.cpp
index 729a1d3..f41271d 100644
--- a/src/3rdparty/phonon/gstreamer/backend.cpp
+++ b/src/3rdparty/phonon/gstreamer/backend.cpp
@@ -35,8 +35,6 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_EXPORT_PLUGIN2(phonon_gstreamer, Phonon::Gstreamer::Backend)
-
 namespace Phonon
 {
 namespace Gstreamer
diff --git a/src/3rdparty/phonon/gstreamer/backend.h b/src/3rdparty/phonon/gstreamer/backend.h
index d157f11..f424ea1 100644
--- a/src/3rdparty/phonon/gstreamer/backend.h
+++ b/src/3rdparty/phonon/gstreamer/backend.h
@@ -46,6 +46,7 @@ class EffectManager;
 class Backend : public QObject, public BackendInterface
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "BackendInterface3.phonon.kde.org" FILE "gstreamer.json")
     Q_INTERFACES(Phonon::BackendInterface)
 
 public:
diff --git a/src/3rdparty/phonon/gstreamer/gstreamer.json b/src/3rdparty/phonon/gstreamer/gstreamer.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/src/3rdparty/phonon/gstreamer/gstreamer.json
@@ -0,0 +1 @@
+{}
diff --git a/src/3rdparty/phonon/mmf/backend.cpp b/src/3rdparty/phonon/mmf/backend.cpp
index 2cec43b..2a8d661 100644
--- a/src/3rdparty/phonon/mmf/backend.cpp
+++ b/src/3rdparty/phonon/mmf/backend.cpp
@@ -217,7 +217,5 @@ QStringList Backend::availableMimeTypes() const
     return result;
 }
 
-Q_EXPORT_PLUGIN2(phonon_mmf, Phonon::MMF::Backend);
-
 QT_END_NAMESPACE
 
diff --git a/src/3rdparty/phonon/mmf/backend.h b/src/3rdparty/phonon/mmf/backend.h
index a45c92a..bf3288d 100644
--- a/src/3rdparty/phonon/mmf/backend.h
+++ b/src/3rdparty/phonon/mmf/backend.h
@@ -39,7 +39,9 @@ class Backend : public QObject
               , public BackendInterface
 {
     Q_OBJECT
+    Q_PLUGIN_METADATA(IID "BackendInterface3.phonon.kde.org" FILE "mmf.json")
     Q_INTERFACES(Phonon::BackendInterface)
+
 public:
     Backend(QObject *parent = 0);
 
diff --git a/src/3rdparty/phonon/mmf/mmf.json b/src/3rdparty/phonon/mmf/mmf.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/src/3rdparty/phonon/mmf/mmf.json
@@ -0,0 +1 @@
+{}
diff --git a/src/3rdparty/phonon/qt7/backend.h b/src/3rdparty/phonon/qt7/backend.h
index 287fcec..5aeec5a 100644
--- a/src/3rdparty/phonon/qt7/backend.h
+++ b/src/3rdparty/phonon/qt7/backend.h
@@ -32,6 +32,7 @@ namespace QT7
     class Backend : public QObject, public BackendInterface
     {
         Q_OBJECT
+        Q_PLUGIN_METADATA(IID "BackendInterface3.phonon.kde.org" FILE "qt7.json")
         Q_INTERFACES(Phonon::BackendInterface)
 
         public:
diff --git a/src/3rdparty/phonon/qt7/backend.mm b/src/3rdparty/phonon/qt7/backend.mm
index b3ca106..08f273b 100644
--- a/src/3rdparty/phonon/qt7/backend.mm
+++ b/src/3rdparty/phonon/qt7/backend.mm
@@ -267,7 +267,6 @@ QHash<QByteArray, QVariant> Backend::objectDescriptionProperties(ObjectDescripti
     return ret;
 }
 
-Q_EXPORT_PLUGIN2(phonon_qt7, Backend)
 }}
 
 QT_END_NAMESPACE
diff --git a/src/3rdparty/phonon/qt7/qt7.json b/src/3rdparty/phonon/qt7/qt7.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/src/3rdparty/phonon/qt7/qt7.json
@@ -0,0 +1 @@
+{}
diff --git a/src/3rdparty/phonon/waveout/backend.cpp b/src/3rdparty/phonon/waveout/backend.cpp
index 8faa26e..dc17470 100644
--- a/src/3rdparty/phonon/waveout/backend.cpp
+++ b/src/3rdparty/phonon/waveout/backend.cpp
@@ -35,8 +35,6 @@ QT_BEGIN_NAMESPACE
 
 // export as Qt/KDE factory as required
 
-Q_EXPORT_PLUGIN2(phonon_waveout, Phonon::WaveOut::Backend);
-
 namespace Phonon
 {
     namespace WaveOut
diff --git a/src/3rdparty/phonon/waveout/backend.h b/src/3rdparty/phonon/waveout/backend.h
index 060d853..8a2862f 100644
--- a/src/3rdparty/phonon/waveout/backend.h
+++ b/src/3rdparty/phonon/waveout/backend.h
@@ -37,7 +37,9 @@ namespace Phonon
         class Backend : public QObject, public Phonon::BackendInterface
         {
             Q_OBJECT
+            Q_PLUGIN_METADATA(IID "BackendInterface3.phonon.kde.org" FILE "waveout.json")
             Q_INTERFACES(Phonon::BackendInterface)
+
         public:
             Backend(QObject *parent = 0, const QVariantList & = QVariantList());
             virtual ~Backend();
diff --git a/src/3rdparty/phonon/waveout/waveout.json b/src/3rdparty/phonon/waveout/waveout.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/src/3rdparty/phonon/waveout/waveout.json
@@ -0,0 +1 @@
+{}