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

Change-Id: Idb607da32f80784d94556443be6740c6d7223411
2012-11-02 15:40:51 +01:00
parent 962e99534d 79f585b9e9
commit a5947906d3
164 changed files with 3719 additions and 327 deletions
--- a/src/multimedia/audio/qaudio.h
+++ b/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
--- a/src/multimedia/audio/qaudio_mac_p.h
+++ b/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);

--- a/src/multimedia/audio/qaudiobuffer.h
+++ b/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
--- a/src/multimedia/audio/qaudiobuffer_p.h
+++ b/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;

--- a/src/multimedia/audio/qaudiodecoder.h
+++ b/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
 {
--- a/src/multimedia/audio/qaudiodevicefactory_p.h
+++ b/src/multimedia/audio/qaudiodevicefactory_p.h
@@ -65,8 +65,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QAbstractAudioInput;
 class QAbstractAudioOutput;
--- a/src/multimedia/audio/qaudiodeviceinfo.h
+++ b/src/multimedia/audio/qaudiodeviceinfo.h
@@ -59,8 +59,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QAudioDeviceFactory;

--- a/src/multimedia/audio/qaudiodeviceinfo_alsa_p.h
+++ b/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[] =
--- a/src/multimedia/audio/qaudiodeviceinfo_mac_p.h
+++ b/src/multimedia/audio/qaudiodeviceinfo_mac_p.h
@@ -62,8 +62,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QAudioDeviceInfoInternal : public QAbstractAudioDeviceInfo
 {
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/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;
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.h
+++ b/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 };
--- a/src/multimedia/audio/qaudioformat.h
+++ b/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
--- a/src/multimedia/audio/qaudioinput.h
+++ b/src/multimedia/audio/qaudioinput.h
@@ -57,8 +57,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-


 class QAbstractAudioInput;
--- a/src/multimedia/audio/qaudioinput_alsa_p.h
+++ b/src/multimedia/audio/qaudioinput_alsa_p.h
@@ -71,8 +71,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class InputPrivate;

--- a/src/multimedia/audio/qaudioinput_mac_p.h
+++ b/src/multimedia/audio/qaudioinput_mac_p.h
@@ -72,8 +72,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QTimer;
 class QIODevice;
--- a/src/multimedia/audio/qaudioinput_win32_p.h
+++ b/src/multimedia/audio/qaudioinput_win32_p.h
@@ -53,9 +53,7 @@
 #ifndef QAUDIOINPUTWIN_H
 #define QAUDIOINPUTWIN_H

-#define NOMINMAX
-
-#include <windows.h>
+#include <QtCore/qt_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)
--- a/src/multimedia/audio/qaudiooutput.h
+++ b/src/multimedia/audio/qaudiooutput.h
@@ -57,8 +57,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-


 class QAbstractAudioOutput;
--- a/src/multimedia/audio/qaudiooutput_alsa_p.h
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.h
@@ -70,8 +70,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class OutputPrivate;

--- a/src/multimedia/audio/qaudiooutput_mac_p.h
+++ b/src/multimedia/audio/qaudiooutput_mac_p.h
@@ -72,8 +72,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QIODevice;
 class QAbstractAudioDeviceInfo;
--- a/src/multimedia/audio/qaudiooutput_win32_p.h
+++ b/src/multimedia/audio/qaudiooutput_win32_p.h
@@ -53,9 +53,7 @@
 #ifndef QAUDIOOUTPUTWIN_H
 #define QAUDIOOUTPUTWIN_H

-#define NOMINMAX
-
-#include <windows.h>
+#include <QtCore/qt_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
 {
--- a/src/multimedia/audio/qaudioprobe.h
+++ b/src/multimedia/audio/qaudioprobe.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 class QMediaObject;
 class QMediaRecorder;

--- a/src/multimedia/audio/qaudiosystem.h
+++ b/src/multimedia/audio/qaudiosystem.h
@@ -53,8 +53,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/audio/qaudiosystemplugin.h
+++ b/src/multimedia/audio/qaudiosystemplugin.h
@@ -57,8 +57,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/audio/qsamplecache_p.h
+++ b/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;
--- a/src/multimedia/audio/qsound.h
+++ b/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
--- a/src/multimedia/audio/qsoundeffect.h
+++ b/src/multimedia/audio/qsoundeffect.h
@@ -52,8 +52,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QSoundEffectPrivate;

--- a/src/multimedia/audio/qsoundeffect_pulse_p.h
+++ b/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
--- a/src/multimedia/audio/qsoundeffect_qaudio_p.h
+++ b/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
--- a/src/multimedia/audio/qwavedecoder_p.h
+++ b/src/multimedia/audio/qwavedecoder_p.h
@@ -61,8 +61,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-


 class QWaveDecoder : public QIODevice
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -62,8 +62,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QAbstractVideoSurface;
 class QVideoWidget;
--- a/src/multimedia/camera/qcameraexposure.h
+++ b/src/multimedia/camera/qcameraexposure.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QCamera;
 class QCameraExposurePrivate;
--- a/src/multimedia/camera/qcamerafocus.h
+++ b/src/multimedia/camera/qcamerafocus.h
@@ -56,8 +56,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QCamera;

--- a/src/multimedia/camera/qcameraimagecapture.h
+++ b/src/multimedia/camera/qcameraimagecapture.h
@@ -53,8 +53,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 class QSize;
 QT_END_NAMESPACE

--- a/src/multimedia/camera/qcameraimageprocessing.h
+++ b/src/multimedia/camera/qcameraimageprocessing.h
@@ -57,8 +57,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QCamera;

--- a/src/multimedia/controls/qaudiodecodercontrol.h
+++ b/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
 {
--- a/src/multimedia/controls/qaudioencodersettingscontrol.h
+++ b/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
--- a/src/multimedia/controls/qaudioinputselectorcontrol.h
+++ b/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;
--- a/src/multimedia/controls/qaudiooutputselectorcontrol.h
+++ b/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;
--- a/src/multimedia/controls/qcameracapturebufferformatcontrol.h
+++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qcameracapturedestinationcontrol.h
+++ b/src/multimedia/controls/qcameracapturedestinationcontrol.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qcameracontrol.h
+++ b/src/multimedia/controls/qcameracontrol.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qcameraexposurecontrol.h
+++ b/src/multimedia/controls/qcameraexposurecontrol.h
@@ -53,8 +53,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qcamerafeedbackcontrol.h
+++ b/src/multimedia/controls/qcamerafeedbackcontrol.h
@@ -54,8 +54,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qcameraflashcontrol.h
+++ b/src/multimedia/controls/qcameraflashcontrol.h
@@ -52,8 +52,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qcamerafocuscontrol.h
+++ b/src/multimedia/controls/qcamerafocuscontrol.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qcameraimagecapturecontrol.h
+++ b/src/multimedia/controls/qcameraimagecapturecontrol.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 class QImage;
 QT_END_NAMESPACE

--- a/src/multimedia/controls/qcameraimageprocessingcontrol.h
+++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h
@@ -52,8 +52,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qcameralockscontrol.h
+++ b/src/multimedia/controls/qcameralockscontrol.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qcameraviewfindersettingscontrol.h
+++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.h
@@ -50,8 +50,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qcamerazoomcontrol.h
+++ b/src/multimedia/controls/qcamerazoomcontrol.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qimageencodercontrol.h
+++ b/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
--- a/src/multimedia/controls/qmediaaudioprobecontrol.h
+++ b/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
 {
--- a/src/multimedia/controls/qmediaavailabilitycontrol.h
+++ b/src/multimedia/controls/qmediaavailabilitycontrol.h
@@ -50,8 +50,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qmediacontainercontrol.h
+++ b/src/multimedia/controls/qmediacontainercontrol.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qmediagaplessplaybackcontrol.h
+++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.h
@@ -48,8 +48,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qmedianetworkaccesscontrol.h
+++ b/src/multimedia/controls/qmedianetworkaccesscontrol.h
@@ -52,8 +52,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qmediaplayercontrol.h
+++ b/src/multimedia/controls/qmediaplayercontrol.h
@@ -52,8 +52,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QMediaPlaylist;

--- a/src/multimedia/controls/qmediaplaylistcontrol_p.h
+++ b/src/multimedia/controls/qmediaplaylistcontrol_p.h
@@ -63,8 +63,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QMediaPlaylistProvider;

--- a/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h
+++ b/src/multimedia/controls/qmediaplaylistsourcecontrol_p.h
@@ -60,8 +60,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QMediaPlaylist;

--- a/src/multimedia/controls/qmediarecordercontrol.h
+++ b/src/multimedia/controls/qmediarecordercontrol.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 class QUrl;
 QT_END_NAMESPACE

--- a/src/multimedia/controls/qmediastreamscontrol.h
+++ b/src/multimedia/controls/qmediastreamscontrol.h
@@ -52,8 +52,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qmediavideoprobecontrol.h
+++ b/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
 {
--- a/src/multimedia/controls/qmetadatareadercontrol.h
+++ b/src/multimedia/controls/qmetadatareadercontrol.h
@@ -54,8 +54,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qmetadatawritercontrol.h
+++ b/src/multimedia/controls/qmetadatawritercontrol.h
@@ -54,8 +54,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qradiodatacontrol.h
+++ b/src/multimedia/controls/qradiodatacontrol.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qradiotunercontrol.h
+++ b/src/multimedia/controls/qradiotunercontrol.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qvideodeviceselectorcontrol.h
+++ b/src/multimedia/controls/qvideodeviceselectorcontrol.h
@@ -48,8 +48,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/controls/qvideoencodersettingscontrol.h
+++ b/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
--- a/src/multimedia/controls/qvideorenderercontrol.h
+++ b/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
 {
--- a/src/multimedia/controls/qvideowindowcontrol.h
+++ b/src/multimedia/controls/qvideowindowcontrol.h
@@ -51,8 +51,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/doc/qtmultimedia.qdocconf
+++ b/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"
--- a/src/multimedia/playback/qmediacontent.h
+++ b/src/multimedia/playback/qmediacontent.h
@@ -53,8 +53,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 class QMediaPlaylist;

 class QMediaContentPrivate;
--- a/src/multimedia/playback/qmedianetworkplaylistprovider_p.h
+++ b/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
--- a/src/multimedia/playback/qmediaplayer.h
+++ b/src/multimedia/playback/qmediaplayer.h
@@ -52,8 +52,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QAbstractVideoSurface;
 class QMediaPlaylist;
--- a/src/multimedia/playback/qmediaplaylist.h
+++ b/src/multimedia/playback/qmediaplaylist.h
@@ -54,8 +54,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QMediaPlaylistProvider;

--- a/src/multimedia/playback/qmediaplaylist_p.h
+++ b/src/multimedia/playback/qmediaplaylist_p.h
@@ -70,8 +70,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QMediaPlaylistControl;
 class QMediaPlaylistProvider;
--- a/src/multimedia/playback/qmediaplaylistioplugin_p.h
+++ b/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;
--- a/src/multimedia/playback/qmediaplaylistnavigator_p.h
+++ b/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
--- a/src/multimedia/playback/qmediaplaylistprovider_p.h
+++ b/src/multimedia/playback/qmediaplaylistprovider_p.h
@@ -60,8 +60,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QMediaPlaylistProviderPrivate
 {
--- a/src/multimedia/playback/qmediaresource.h
+++ b/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
--- a/src/multimedia/qmediabindableinterface.h
+++ b/src/multimedia/qmediabindableinterface.h
@@ -48,8 +48,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QMediaObject;

--- a/src/multimedia/qmediacontrol.h
+++ b/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
--- a/src/multimedia/qmediacontrol_p.h
+++ b/src/multimedia/qmediacontrol_p.h
@@ -59,8 +59,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QMediaControl;

--- a/src/multimedia/qmediaenumdebug.h
+++ b/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) \
--- a/src/multimedia/qmediaobject.h
+++ b/src/multimedia/qmediaobject.h
@@ -52,8 +52,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QMediaService;
 class QMediaBindableInterface;
--- a/src/multimedia/qmediaobject_p.h
+++ b/src/multimedia/qmediaobject_p.h
@@ -63,8 +63,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QMetaDataReaderControl;
 class QMediaAvailabilityControl;
--- a/src/multimedia/qmediapluginloader_p.h
+++ b/src/multimedia/qmediapluginloader_p.h
@@ -65,8 +65,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 class QFactoryLoader;
 class QMediaServiceProviderPlugin;

--- a/src/multimedia/qmediaresourcepolicy_p.h
+++ b/src/multimedia/qmediaresourcepolicy_p.h
@@ -49,8 +49,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 class Q_MULTIMEDIA_EXPORT QMediaResourcePolicy
 {
 public:
--- a/src/multimedia/qmediaresourcepolicyplugin_p.h
+++ b/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;
--- a/src/multimedia/qmediaresourceset_p.h
+++ b/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"

--- a/src/multimedia/qmediaservice.h
+++ b/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
--- a/src/multimedia/qmediaservice_p.h
+++ b/src/multimedia/qmediaservice_p.h
@@ -57,8 +57,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QAudioDeviceControl;

--- a/src/multimedia/qmediaserviceprovider_p.h
+++ b/src/multimedia/qmediaserviceprovider_p.h
@@ -52,8 +52,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QMediaService;

--- a/src/multimedia/qmediaserviceproviderplugin.h
+++ b/src/multimedia/qmediaserviceproviderplugin.h
@@ -55,8 +55,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 // Required for QDoc workaround
 class QString;

--- a/src/multimedia/qmediatimerange.h
+++ b/src/multimedia/qmediatimerange.h
@@ -50,8 +50,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QMediaTimeRangePrivate;

--- a/src/multimedia/qtmedianamespace.h
+++ b/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;

--- a/src/multimedia/qtmultimediadefs.h
+++ b/src/multimedia/qtmultimediadefs.h
@@ -58,8 +58,6 @@
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 #ifndef QT_STATIC
 #    if defined(QT_BUILD_MULTIMEDIA_LIB)
 #        define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT
--- a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h
+++ b/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h
@@ -53,8 +53,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 const QLatin1String QSGVideoNodeFactoryPluginKey("sgvideonodes");

 class Q_MULTIMEDIAQUICK_EXPORT QSGVideoNode : public QSGGeometryNode
--- a/src/multimedia/radio/qradiodata.h
+++ b/src/multimedia/radio/qradiodata.h
@@ -52,8 +52,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-

 class QRadioDataPrivate;
 class Q_MULTIMEDIA_EXPORT QRadioData : public QObject, public QMediaBindableInterface
--- a/src/multimedia/radio/qradiotuner.h
+++ b/src/multimedia/radio/qradiotuner.h
@@ -53,8 +53,6 @@ QT_BEGIN_HEADER

 QT_BEGIN_NAMESPACE

-QT_MODULE(Multimedia)
-
 class QRadioData;
 class QRadioTunerPrivate;
 class Q_MULTIMEDIA_EXPORT QRadioTuner : public QMediaObject
--- a/Show More
+++ b/Show More