4 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/pulseaudio/pulseaudio.json b/src/plugins/pulseaudio/pulseaudio.json
new file mode 100644
index 000000000..a31d52107
--- /dev/null
+++ b/src/plugins/pulseaudio/pulseaudio.json
@@ -0,0 +1,3 @@
+{
+    "Keys": ["default"]
+}
diff --git a/src/plugins/pulseaudio/pulseaudio.pro b/src/plugins/pulseaudio/pulseaudio.pro
index 0897b8ff7..0a922aa16 100644
--- a/src/plugins/pulseaudio/pulseaudio.pro
+++ b/src/plugins/pulseaudio/pulseaudio.pro
@@ -26,3 +26,6 @@ SOURCES += qpulseaudioplugin.cpp \
 
 target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
 INSTALLS += target
+
+OTHER_FILES += \
+    pulseaudio.json
diff --git a/src/plugins/pulseaudio/qpulseaudioplugin.cpp b/src/plugins/pulseaudio/qpulseaudioplugin.cpp
index 85490dff8..fab7f7184 100644
--- a/src/plugins/pulseaudio/qpulseaudioplugin.cpp
+++ b/src/plugins/pulseaudio/qpulseaudioplugin.cpp
@@ -55,11 +55,6 @@ QPulseAudioPlugin::QPulseAudioPlugin(QObject *parent)
 {
 }
 
-QStringList QPulseAudioPlugin::keys() const
-{
-    return QStringList() << "default";
-}
-
 QList<QByteArray> QPulseAudioPlugin::availableDevices(QAudio::Mode mode) const
 {
     return m_pulseEngine->availableDevices(mode);
@@ -84,6 +79,4 @@ QAbstractAudioDeviceInfo *QPulseAudioPlugin::createDeviceInfo(const QByteArray &
     return deviceInfo;
 }
 
-Q_EXPORT_PLUGIN2(qtmedia_pulse, QPulseAudioPlugin);
-
 QT_END_NAMESPACE
diff --git a/src/plugins/pulseaudio/qpulseaudioplugin.h b/src/plugins/pulseaudio/qpulseaudioplugin.h
index d52596756..1540f7278 100644
--- a/src/plugins/pulseaudio/qpulseaudioplugin.h
+++ b/src/plugins/pulseaudio/qpulseaudioplugin.h
@@ -52,11 +52,12 @@ class QPulseAudioPlugin : public QAudioSystemPlugin
 {
     Q_OBJECT
 
+    Q_PLUGIN_METADATA(IID "com.nokia.qt.QAudioSystemFactoryInterface" FILE "pulseaudio.json")
+
 public:
     QPulseAudioPlugin(QObject *parent = 0);
     ~QPulseAudioPlugin() {}
 
-    QStringList keys() const;
     QList<QByteArray> availableDevices(QAudio::Mode mode) const;
     QAbstractAudioInput *createInput(const QByteArray &device);
     QAbstractAudioOutput *createOutput(const QByteArray &device);