summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/3rdparty/phonon/ds9/backend.cpp2
-rw-r--r--src/3rdparty/phonon/ds9/backend.h4
-rw-r--r--src/3rdparty/phonon/ds9/ds9.json1
-rw-r--r--src/3rdparty/phonon/gstreamer/backend.cpp2
-rw-r--r--src/3rdparty/phonon/gstreamer/backend.h1
-rw-r--r--src/3rdparty/phonon/gstreamer/gstreamer.json1
-rw-r--r--src/3rdparty/phonon/mmf/backend.cpp2
-rw-r--r--src/3rdparty/phonon/mmf/backend.h2
-rw-r--r--src/3rdparty/phonon/mmf/mmf.json1
-rw-r--r--src/3rdparty/phonon/qt7/backend.h1
-rw-r--r--src/3rdparty/phonon/qt7/backend.mm1
-rw-r--r--src/3rdparty/phonon/qt7/qt7.json1
-rw-r--r--src/3rdparty/phonon/waveout/backend.cpp2
-rw-r--r--src/3rdparty/phonon/waveout/backend.h2
-rw-r--r--src/3rdparty/phonon/waveout/waveout.json1
-rw-r--r--src/plugins/phonon/ds9/ds9.pro2
-rw-r--r--src/plugins/phonon/gstreamer/gstreamer.pro2
-rw-r--r--src/plugins/phonon/mmf/mmf.pro2
-rw-r--r--src/plugins/phonon/qt7/qt7.pro2
-rw-r--r--src/plugins/phonon/waveout/waveout.pro1
20 files changed, 23 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 @@
+{}
diff --git a/src/plugins/phonon/ds9/ds9.pro b/src/plugins/phonon/ds9/ds9.pro
index 702ac53..3c84c8f 100644
--- a/src/plugins/phonon/ds9/ds9.pro
+++ b/src/plugins/phonon/ds9/ds9.pro
@@ -54,6 +54,8 @@ SOURCES += \
$$PHONON_DS9_DIR/qaudiocdreader.cpp \
$$PHONON_DS9_DIR/qmeminputpin.cpp
+OTHER_FILES += $$PHONON_DS9_DIR/ds9.json
+
#the EVR renderer (only available on desktop)
!wince*:SOURCES += $$PHONON_DS9_DIR/videorenderer_evr.cpp \
$$PHONON_DS9_DIR/videorenderer_vmr9.cpp
diff --git a/src/plugins/phonon/gstreamer/gstreamer.pro b/src/plugins/phonon/gstreamer/gstreamer.pro
index aeb488e..34b2a5b 100644
--- a/src/plugins/phonon/gstreamer/gstreamer.pro
+++ b/src/plugins/phonon/gstreamer/gstreamer.pro
@@ -60,6 +60,8 @@ SOURCES += $$PHONON_GSTREAMER_DIR/abstractrenderer.cpp \
$$PHONON_GSTREAMER_DIR/volumefadereffect.cpp \
$$PHONON_GSTREAMER_DIR/widgetrenderer.cpp
+OTHER_FILES += $$PHONON_GSTREAMER_DIR/gstreamer.json
+
false {
HEADERS += $$PHONON_GSTREAMER_DIR/x11renderer.h
SOURCES += $$PHONON_GSTREAMER_DIR/x11renderer.cpp
diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index b7fc0e2..3aff698 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -77,6 +77,8 @@ symbian {
$$PHONON_MMF_DIR/utils.cpp \
$$PHONON_MMF_DIR/videowidget.cpp
+ OTHER_FILES += $$PHONON_MMF_DIR/mmf.json
+
symbian {
# Test for whether the build environment supports video rendering to graphics
# surfaces.
diff --git a/src/plugins/phonon/qt7/qt7.pro b/src/plugins/phonon/qt7/qt7.pro
index db6b6d0..9eab58b 100644
--- a/src/plugins/phonon/qt7/qt7.pro
+++ b/src/plugins/phonon/qt7/qt7.pro
@@ -72,6 +72,8 @@ OBJECTIVE_SOURCES += $$PHONON_QUICKTIME_DIR/quicktimevideoplayer.mm \
$$PHONON_QUICKTIME_DIR/audionode.mm \
$$PHONON_QUICKTIME_DIR/videowidget.mm
+OTHER_FILES += $$PHONON_QUICKTIME_DIR/qt7.json
+
target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
INSTALLS += target
diff --git a/src/plugins/phonon/waveout/waveout.pro b/src/plugins/phonon/waveout/waveout.pro
index 2f46010..6a990ab 100644
--- a/src/plugins/phonon/waveout/waveout.pro
+++ b/src/plugins/phonon/waveout/waveout.pro
@@ -18,6 +18,7 @@ SOURCES += $$PHONON_WAVEOUT_DIR/audiooutput.cpp \
$$PHONON_WAVEOUT_DIR/backend.cpp \
$$PHONON_WAVEOUT_DIR/mediaobject.cpp
+OTHER_FILES += $$PHONON_WAVEOUT_DIR/waveout.json
target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
INSTALLS += target
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 07:01:56 +0000