Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtmultimedia into newdocs

Change-Id: Idb607da32f80784d94556443be6740c6d7223411

qtmultimedia.pro

@@ -6,6 +6,8 @@ win32 {
     qtCompileTest(wmp)
     qtCompileTest(wmf)
     qtCompileTest(evr)
+} else:mac {
+    qtCompileTest(avfoundation)
 } else {
     qtCompileTest(alsa)
     qtCompileTest(pulseaudio)
@@ -18,9 +20,5 @@ win32 {
     qtCompileTest(xvideo)
 }
 
-mac {
-    qtCompileTest(avfoundation)
-}
-
 load(qt_parts)
 

src/imports/audioengine/qdeclarative_audioengine_p.cpp

@@ -404,7 +404,7 @@ void QDeclarativeAudioEngine::appendFunction(QQmlListProperty<QObject> *property
 
 QQmlListProperty<QObject> QDeclarativeAudioEngine::bank()
 {
-    return QQmlListProperty<QObject>(this, 0, appendFunction);
+    return QQmlListProperty<QObject>(this, 0, appendFunction, 0, 0, 0);
 }
 
 /*!

src/imports/audioengine/qdeclarative_sound_p.cpp

@@ -363,7 +363,7 @@ void QDeclarativeSound::setCategoryObject(QDeclarativeAudioCategory *categoryObj
 
 QQmlListProperty<QDeclarativePlayVariation> QDeclarativeSound::playVariationlist()
 {
-    return QQmlListProperty<QDeclarativePlayVariation>(this, 0, appendFunction);
+    return QQmlListProperty<QDeclarativePlayVariation>(this, 0, appendFunction, 0, 0, 0);
 }
 
 QList<QDeclarativePlayVariation*>& QDeclarativeSound::playlist()

src/imports/multimedia/qdeclarativevideooutput_window.cpp

@@ -41,7 +41,7 @@
 
 #include "qdeclarativevideooutput_window_p.h"
 #include "qdeclarativevideooutput_p.h"
-#include <QtQuick/qquickcanvas.h>
+#include <QtQuick/qquickwindow.h>
 #include <QtMultimedia/qmediaservice.h>
 #include <QtMultimedia/qvideowindowcontrol.h>
 
@@ -63,8 +63,8 @@ bool QDeclarativeVideoWindowBackend::init(QMediaService *service)
 {
     if (QMediaControl *control = service->requestControl(QVideoWindowControl_iid)) {
         if ((m_videoWindowControl = qobject_cast<QVideoWindowControl *>(control))) {
-            if (q->canvas())
+            if (q->window())
-                m_videoWindowControl->setWinId(q->canvas()->winId());
+                m_videoWindowControl->setWinId(q->window()->winId());
             m_service = service;
             QObject::connect(m_videoWindowControl.data(), SIGNAL(nativeSizeChanged()),
                              q, SLOT(_q_updateNativeSize()));

src/multimedia/audio/qaudio.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 //QTM_SYNC_HEADER_EXPORT QAudio
 
 // Class forward declaration required for QDoc bug

src/multimedia/audio/qaudio_mac_p.h

@@ -65,8 +65,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 extern QAudioFormat toQAudioFormat(const AudioStreamBasicDescription& streamFormat);
 extern AudioStreamBasicDescription toAudioStreamBasicDescription(QAudioFormat const& audioFormat);
 

src/multimedia/audio/qaudiobuffer.h

@@ -54,8 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QAbstractAudioBuffer;
 class QAudioBufferPrivate;
 class Q_MULTIMEDIA_EXPORT QAudioBuffer

src/multimedia/audio/qaudiobuffer_p.h

@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/audio/qaudiodecoder.h

@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QAudioDecoderPrivate;
 class Q_MULTIMEDIA_EXPORT QAudioDecoder : public QMediaObject
 {

src/multimedia/audio/qaudiodevicefactory_p.h

@@ -65,8 +65,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QAbstractAudioInput;
 class QAbstractAudioOutput;

src/multimedia/audio/qaudiodeviceinfo.h

@@ -59,8 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QAudioDeviceFactory;
 

src/multimedia/audio/qaudiodeviceinfo_alsa_p.h

@@ -69,8 +69,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 const unsigned int MAX_SAMPLE_RATES = 5;
 const unsigned int SAMPLE_RATES[] =

src/multimedia/audio/qaudiodeviceinfo_mac_p.h

@@ -62,8 +62,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QAudioDeviceInfoInternal : public QAbstractAudioDeviceInfo
 {

src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp

@@ -51,14 +51,37 @@
 //
 
 
-#include <windows.h>
+#include <QtCore/qt_windows.h>
 #include <mmsystem.h>
 #include "qaudiodeviceinfo_win32_p.h"
-#include <dshow.h>
 
 #if defined(Q_CC_MINGW) && !defined(__MINGW64_VERSION_MAJOR)
+struct IBaseFilter; // Needed for strmif.h from stock MinGW.
+struct _DDPIXELFORMAT;
+typedef struct _DDPIXELFORMAT* LPDDPIXELFORMAT;
+#endif
+
+#include <strmif.h>
+#if !defined(Q_CC_MINGW) || defined(__MINGW64_VERSION_MAJOR)
+#  include <uuids.h>
+#else
 
 extern GUID CLSID_AudioInputDeviceCategory;
+extern GUID CLSID_AudioRendererCategory;
+extern GUID IID_ICreateDevEnum;
+extern GUID CLSID_SystemDeviceEnum;
+
+#ifndef __ICreateDevEnum_INTERFACE_DEFINED__
+#define __ICreateDevEnum_INTERFACE_DEFINED__
+
+DECLARE_INTERFACE_(ICreateDevEnum, IUnknown)
+{
+    STDMETHOD(CreateClassEnumerator)(REFCLSID clsidDeviceClass,
+                                     IEnumMoniker **ppEnumMoniker,
+                                     DWORD dwFlags) PURE;
+};
+
+#endif //  __ICreateDevEnum_INTERFACE_DEFINED__
 
 #ifndef __IErrorLog_INTERFACE_DEFINED__
 #define __IErrorLog_INTERFACE_DEFINED__
@@ -286,7 +309,7 @@ void QAudioDeviceInfoInternal::updateLists()
 {
     // redo all lists based on current settings
     bool match = false;
-    DWORD fmt = NULL;
+    DWORD fmt = 0;
 
     if(mode == QAudio::AudioOutput) {
         WAVEOUTCAPS woc;

src/multimedia/audio/qaudiodeviceinfo_win32_p.h

@@ -67,8 +67,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 const unsigned int MAX_SAMPLE_RATES = 5;
 const unsigned int SAMPLE_RATES[] = { 8000, 11025, 22050, 44100, 48000 };

src/multimedia/audio/qaudioformat.h

@@ -53,8 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QAudioFormatPrivate;
 
 class Q_MULTIMEDIA_EXPORT QAudioFormat

src/multimedia/audio/qaudioinput.h

@@ -57,8 +57,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 
 class QAbstractAudioInput;

src/multimedia/audio/qaudioinput_alsa_p.h

@@ -71,8 +71,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class InputPrivate;
 

src/multimedia/audio/qaudioinput_mac_p.h

@@ -72,8 +72,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QTimer;
 class QIODevice;

src/multimedia/audio/qaudioinput_win32_p.h

@@ -53,9 +53,7 @@
 #ifndef QAUDIOINPUTWIN_H
 #define QAUDIOINPUTWIN_H
 
-#define NOMINMAX
+#include <QtCore/qt_windows.h>
-
-#include <windows.h>
 #include <mmsystem.h>
 
 #include <QtCore/qfile.h>
@@ -75,8 +73,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 // For compat with 4.6
 #if !defined(QT_WIN_CALLBACK)

src/multimedia/audio/qaudiooutput.h

@@ -57,8 +57,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 
 class QAbstractAudioOutput;

src/multimedia/audio/qaudiooutput_alsa_p.h

@@ -70,8 +70,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class OutputPrivate;
 

src/multimedia/audio/qaudiooutput_mac_p.h

@@ -72,8 +72,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QIODevice;
 class QAbstractAudioDeviceInfo;

src/multimedia/audio/qaudiooutput_win32_p.h

@@ -53,9 +53,7 @@
 #ifndef QAUDIOOUTPUTWIN_H
 #define QAUDIOOUTPUTWIN_H
 
-#define NOMINMAX
+#include <QtCore/qt_windows.h>
-
-#include <windows.h>
 #include <mmsystem.h>
 
 #include <QtCore/qdebug.h>
@@ -82,8 +80,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QAudioOutputPrivate : public QAbstractAudioOutput
 {

src/multimedia/audio/qaudioprobe.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QMediaObject;
 class QMediaRecorder;
 

src/multimedia/audio/qaudiosystem.h

@@ -53,8 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/audio/qaudiosystemplugin.h

@@ -57,8 +57,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/audio/qsamplecache_p.h

@@ -66,8 +66,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QIODevice;
 class QNetworkAccessManager;
 class QSampleCache;

src/multimedia/audio/qsound.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QSoundEffect;
 
 class Q_MULTIMEDIA_EXPORT QSound : public QObject

src/multimedia/audio/qsoundeffect.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QSoundEffectPrivate;
 

src/multimedia/audio/qsoundeffect_pulse_p.h

@@ -66,8 +66,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QSoundEffectRef;
 
 class QSoundEffectPrivate : public QObject

src/multimedia/audio/qsoundeffect_qaudio_p.h

@@ -63,8 +63,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QSoundEffectPrivate;
 
 class PrivateSoundSource : public QIODevice

src/multimedia/audio/qwavedecoder_p.h

@@ -61,8 +61,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 
 class QWaveDecoder : public QIODevice

src/multimedia/camera/qcamera.h

@@ -62,8 +62,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QAbstractVideoSurface;
 class QVideoWidget;

src/multimedia/camera/qcameraexposure.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QCamera;
 class QCameraExposurePrivate;

src/multimedia/camera/qcamerafocus.h

@@ -56,8 +56,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QCamera;
 

src/multimedia/camera/qcameraimagecapture.h

@@ -53,8 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QSize;
 QT_END_NAMESPACE
 

src/multimedia/camera/qcameraimageprocessing.h

@@ -57,8 +57,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QCamera;
 

src/multimedia/controls/qaudiodecodercontrol.h

@@ -53,8 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QIODevice;
 class Q_MULTIMEDIA_EXPORT QAudioDecoderControl : public QMediaControl
 {

src/multimedia/controls/qaudioencodersettingscontrol.h

@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QStringList;
 class QAudioFormat;
 QT_END_NAMESPACE

src/multimedia/controls/qaudioinputselectorcontrol.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 // Class forward declaration required for QDoc bug
 class QString;

src/multimedia/controls/qaudiooutputselectorcontrol.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 // Class forward declaration required for QDoc bug
 class QString;

src/multimedia/controls/qcameracapturebufferformatcontrol.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qcameracapturedestinationcontrol.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qcameracontrol.h

@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qcameraexposurecontrol.h

@@ -53,8 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qcamerafeedbackcontrol.h

@@ -54,8 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qcameraflashcontrol.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qcamerafocuscontrol.h

@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qcameraimagecapturecontrol.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QImage;
 QT_END_NAMESPACE
 

src/multimedia/controls/qcameraimageprocessingcontrol.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qcameralockscontrol.h

@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qcameraviewfindersettingscontrol.h

@@ -50,8 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qcamerazoomcontrol.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qimageencodercontrol.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QByteArray;
 class QStringList;
 QT_END_NAMESPACE

src/multimedia/controls/qmediaaudioprobecontrol.h

@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QAudioBuffer;
 class Q_MULTIMEDIA_EXPORT QMediaAudioProbeControl : public QMediaControl
 {

src/multimedia/controls/qmediaavailabilitycontrol.h

@@ -50,8 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qmediacontainercontrol.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qmediagaplessplaybackcontrol.h

@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qmedianetworkaccesscontrol.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qmediaplayercontrol.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaPlaylist;
 

src/multimedia/controls/qmediaplaylistcontrol_p.h

@@ -63,8 +63,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaPlaylistProvider;
 

src/multimedia/controls/qmediaplaylistsourcecontrol_p.h

@@ -60,8 +60,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaPlaylist;
 

src/multimedia/controls/qmediarecordercontrol.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QUrl;
 QT_END_NAMESPACE
 

src/multimedia/controls/qmediastreamscontrol.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qmediavideoprobecontrol.h

@@ -50,8 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QVideoFrame;
 class Q_MULTIMEDIA_EXPORT QMediaVideoProbeControl : public QMediaControl
 {

src/multimedia/controls/qmetadatareadercontrol.h

@@ -54,8 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qmetadatawritercontrol.h

@@ -54,8 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qradiodatacontrol.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qradiotunercontrol.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qvideodeviceselectorcontrol.h

@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/controls/qvideoencodersettingscontrol.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QByteArray;
 class QStringList;
 QT_END_NAMESPACE

src/multimedia/controls/qvideorenderercontrol.h

@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QAbstractVideoSurface;
 class Q_MULTIMEDIA_EXPORT QVideoRendererControl : public QMediaControl
 {

src/multimedia/controls/qvideowindowcontrol.h

@@ -51,8 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/doc/qtmultimedia.qdocconf

@@ -76,9 +76,4 @@ sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
 HTML.nobreadcrumbs = "true"
 
 HTML.templatedir = .
-HTML.stylesheets = style/qtmultimedia.css
 
-HTML.headerstyles = "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/qtmultimedia.css\" />\n"
-HTML.endheader = "</head>\n<body>\n"
-
-HTML.footer = "<div class=\"footer\">Copyright (c) 2012 Digia Plc and/or its subsidiaries. All rights reserved.</div>\n"

src/multimedia/playback/qmediacontent.h

@@ -53,8 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QMediaPlaylist;
 
 class QMediaContentPrivate;

src/multimedia/playback/qmedianetworkplaylistprovider_p.h

@@ -59,8 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaNetworkPlaylistProviderPrivate;
 class Q_MULTIMEDIA_EXPORT QMediaNetworkPlaylistProvider : public QMediaPlaylistProvider

src/multimedia/playback/qmediaplayer.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QAbstractVideoSurface;
 class QMediaPlaylist;

src/multimedia/playback/qmediaplaylist.h

@@ -54,8 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaPlaylistProvider;
 

src/multimedia/playback/qmediaplaylist_p.h

@@ -70,8 +70,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaPlaylistControl;
 class QMediaPlaylistProvider;

src/multimedia/playback/qmediaplaylistioplugin_p.h

@@ -64,8 +64,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QString;
 class QUrl;
 class QByteArray;

src/multimedia/playback/qmediaplaylistnavigator_p.h

@@ -61,8 +61,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaPlaylistNavigatorPrivate;
 class Q_MULTIMEDIA_EXPORT QMediaPlaylistNavigator : public QObject

src/multimedia/playback/qmediaplaylistprovider_p.h

@@ -60,8 +60,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaPlaylistProviderPrivate
 {

src/multimedia/playback/qmediaresource.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Class forward declaration required for QDoc bug
 class QString;
 class Q_MULTIMEDIA_EXPORT QMediaResource

src/multimedia/qmediabindableinterface.h

@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaObject;
 

src/multimedia/qmediacontrol.h

@@ -53,8 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaControlPrivate;
 class Q_MULTIMEDIA_EXPORT QMediaControl : public QObject

src/multimedia/qmediacontrol_p.h

@@ -59,8 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaControl;
 

src/multimedia/qmediaenumdebug.h

@@ -58,8 +58,6 @@
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 #ifndef QT_NO_DEBUG_STREAM
 
 #define Q_MEDIA_ENUM_DEBUG(Class,Enum) \

src/multimedia/qmediaobject.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaService;
 class QMediaBindableInterface;

src/multimedia/qmediaobject_p.h

@@ -63,8 +63,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMetaDataReaderControl;
 class QMediaAvailabilityControl;

src/multimedia/qmediapluginloader_p.h

@@ -65,8 +65,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class QFactoryLoader;
 class QMediaServiceProviderPlugin;
 

src/multimedia/qmediaresourcepolicy_p.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 class Q_MULTIMEDIA_EXPORT QMediaResourcePolicy
 {
 public:

src/multimedia/qmediaresourcepolicyplugin_p.h

@@ -49,8 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 struct Q_MULTIMEDIA_EXPORT QMediaResourceSetFactoryInterface
 {
     virtual QObject* create(const QString& interfaceId) = 0;

src/multimedia/qmediaresourceset_p.h

@@ -48,8 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 #define QMediaPlayerResourceSetInterface_iid \
     "org.qt-project.qt.mediaplayerresourceset/5.0"
 

src/multimedia/qmediaservice.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaServicePrivate;
 class Q_MULTIMEDIA_EXPORT QMediaService : public QObject

src/multimedia/qmediaservice_p.h

@@ -57,8 +57,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QAudioDeviceControl;
 

src/multimedia/qmediaserviceprovider_p.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaService;
 

src/multimedia/qmediaserviceproviderplugin.h

@@ -55,8 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;
 

src/multimedia/qmediatimerange.h

@@ -50,8 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 
 class QMediaTimeRangePrivate;
 

src/multimedia/qtmedianamespace.h

@@ -52,8 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Multimedia)
-
 // Class forward declaration required for QDoc bug
 class QString;