diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-23 10:29:35 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-24 22:13:22 +0100 |
| commit | b362e749bf7d87539ec5c8025b7af9394f1c3cde (patch) | |
| tree | e25b314b131218a4e121192fb48bdd1fbfa89b08 /src/3rdparty/phonon/waveout | |
| parent | 4581ddf4cb6eefdb015434045c15c979788b4da4 (diff) | |
Use new plugin system in Phonon.
Change-Id: I8e2c005149fe1aa837697187c7401c06e0c05010
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/3rdparty/phonon/waveout')
| -rw-r--r-- | src/3rdparty/phonon/waveout/backend.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/phonon/waveout/backend.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/phonon/waveout/waveout.json | 1 |
3 files changed, 3 insertions, 2 deletions
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 @@ +{} |