diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-23 01:38:09 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-23 01:38:09 (GMT) |
| commit | b1c59bde1e29a62141a10f30a15f02bc1d59558b (patch) | |
| tree | 0eb28382d71385a89022a9b6560daa20d224759e /src/plugins | |
| parent | 0771d24f2ea3ba46c8e825b8720561258f9646ce (diff) | |
| parent | ed4e6e2e54692d2e253cc704d30d8c8a238ff0a1 (diff) | |
| download | Qt-b1c59bde1e29a62141a10f30a15f02bc1d59558b.zip Qt-b1c59bde1e29a62141a10f30a15f02bc1d59558b.tar.gz Qt-b1c59bde1e29a62141a10f30a15f02bc1d59558b.tar.bz2 | |
Merge remote branch 'staging/master' into bearermanagement/unit-tests
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/mediaservices/gstreamer/qgstreamerbushelper.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmlmodules/multimedia/multimedia.cpp | 8 |
3 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/mediaservices/gstreamer/qgstreamerbushelper.cpp b/src/plugins/mediaservices/gstreamer/qgstreamerbushelper.cpp index 4649c21..59ae5be 100644 --- a/src/plugins/mediaservices/gstreamer/qgstreamerbushelper.cpp +++ b/src/plugins/mediaservices/gstreamer/qgstreamerbushelper.cpp @@ -174,7 +174,7 @@ static GstBusSyncReply syncGstBusFilter(GstBus* bus, GstMessage* message, QGstre /*! - \class gstreamer::QGstreamerBusHelper + \class QGstreamerBusHelper \internal */ diff --git a/src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp b/src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp index 13a2454..0a689d9 100644 --- a/src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp +++ b/src/plugins/mediaservices/gstreamer/qgstreamermessage.cpp @@ -48,7 +48,7 @@ static int wuchi = qRegisterMetaType<QGstreamerMessage>(); /*! - \class gstreamer::QGstreamerMessage + \class QGstreamerMessage \internal */ diff --git a/src/plugins/qmlmodules/multimedia/multimedia.cpp b/src/plugins/qmlmodules/multimedia/multimedia.cpp index 381fb56..d9414ee 100644 --- a/src/plugins/qmlmodules/multimedia/multimedia.cpp +++ b/src/plugins/qmlmodules/multimedia/multimedia.cpp @@ -41,9 +41,7 @@ #include <QtDeclarative/qmlmoduleplugin.h> #include <QtDeclarative/qml.h> -#include <QtMultimedia/private/qsoundeffect_p.h> -#include <QtMultimedia/private/qmlaudio_p.h> -#include <QtMultimedia/private/qmlgraphicsvideo_p.h> +#include <QtMultimedia/qml.h> QT_BEGIN_NAMESPACE @@ -61,9 +59,7 @@ public: Q_UNUSED(uri) Q_ASSERT(uri == QLatin1String("Qt.multimedia")); - qmlRegisterType<QSoundEffect>("Qt.multimedia", 4, 7, "SoundEffect", "SoundEffect"); - qmlRegisterType<QmlAudio>("Qt.multimedia", 4, 7, "Audio", "Audio"); - qmlRegisterType<QmlGraphicsVideo>("Qt.multimedia", 4, 7, "Video", "Video"); + QtMultimedia::qRegisterQmlElements(); } }; |