Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: I0f78796735fc37e092b6747bdc89cc0f41164472

examples/multimediawidgets/camera/camera.cpp

@@ -136,6 +136,8 @@ void Camera::setCamera(const QByteArray &cameraDevice)
     connect(imageCapture, SIGNAL(readyForCaptureChanged(bool)), this, SLOT(readyForCapture(bool)));
     connect(imageCapture, SIGNAL(imageCaptured(int,QImage)), this, SLOT(processCapturedImage(int,QImage)));
     connect(imageCapture, SIGNAL(imageSaved(int,QString)), this, SLOT(imageSaved(int,QString)));
+    connect(imageCapture, SIGNAL(error(int,QCameraImageCapture::Error,QString)), this,
+            SLOT(displayCaptureError(int,QCameraImageCapture::Error,QString)));
 
     connect(camera, SIGNAL(lockStatusChanged(QCamera::LockStatus, QCamera::LockChangeReason)),
             this, SLOT(updateLockStatus(QCamera::LockStatus, QCamera::LockChangeReason)));
@@ -320,6 +322,14 @@ void Camera::takeImage()
     imageCapture->capture();
 }
 
+void Camera::displayCaptureError(int id, const QCameraImageCapture::Error error, const QString &errorString)
+{
+    Q_UNUSED(id);
+    Q_UNUSED(error);
+    QMessageBox::warning(this, tr("Image Capture Error"), errorString);
+    isCapturingImage = false;
+}
+
 void Camera::startCamera()
 {
     camera->start();

examples/multimediawidgets/camera/camera.h

@@ -72,6 +72,7 @@ private slots:
 
     void toggleLock();
     void takeImage();
+    void displayCaptureError(int, QCameraImageCapture::Error, const QString &errorString);
 
     void configureCaptureSettings();
     void configureVideoSettings();

examples/multimediawidgets/camera/camera.ui

@@ -138,6 +138,9 @@
        <layout class="QGridLayout" name="gridLayout">
         <item row="0" column="0">
          <widget class="QPushButton" name="takeImageButton">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
           <property name="text">
            <string>Capture Photo</string>
           </property>
@@ -245,7 +248,7 @@
      <x>0</x>
      <y>0</y>
      <width>668</width>
-     <height>29</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">

src/imports/audioengine/qaudioengine_openal_p.h

@@ -58,8 +58,6 @@
 #include "qsoundsource_p.h"
 #include "qsoundbuffer_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QSoundBufferPrivateAL : public QSoundBuffer
@@ -168,6 +166,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif

src/imports/audioengine/qaudioengine_p.h

@@ -47,8 +47,6 @@
 #include <QtCore/QUrl>
 #include <QtGui/qvector3d.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QSoundSource;
@@ -105,6 +103,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif

src/imports/audioengine/qdeclarative_attenuationmodel_p.h

@@ -46,8 +46,6 @@
 #include <QtQml/qqmlcomponent.h>
 #include <QVector3D>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeAttenuationModel : public QObject, public QQmlParserStatus
@@ -133,6 +131,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif

src/imports/audioengine/qdeclarative_audiocategory_p.h

@@ -45,8 +45,6 @@
 #include <QtQml/qqml.h>
 #include <QtQml/qqmlcomponent.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeAudioCategory : public QObject, public QQmlParserStatus
@@ -89,6 +87,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif

src/imports/audioengine/qdeclarative_audioengine_p.h

@@ -50,8 +50,6 @@
 #include <QTimer>
 #include "qaudioengine_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeSoundInstance;
@@ -163,6 +161,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif

src/imports/audioengine/qdeclarative_audiolistener_p.h

@@ -45,8 +45,6 @@
 #include <QtCore/QObject>
 #include <QtGui/qvector3d.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeAudioEngine;
@@ -97,6 +95,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif

src/imports/audioengine/qdeclarative_audiosample_p.h

@@ -45,8 +45,6 @@
 #include <QtQml/qqml.h>
 #include <QtQml/qqmlcomponent.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QSoundBuffer;
@@ -106,6 +104,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif

src/imports/audioengine/qdeclarative_playvariation_p.h

@@ -45,8 +45,6 @@
 #include <QtQml/qqml.h>
 #include <QtQml/qqmlcomponent.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeAudioSample;
@@ -106,6 +104,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif

src/imports/audioengine/qdeclarative_sound_p.h

@@ -47,8 +47,6 @@
 #include <QtCore/qlist.h>
 #include "qdeclarative_playvariation_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeAudioCategory;
@@ -171,6 +169,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif

src/imports/audioengine/qdeclarative_soundinstance_p.h

@@ -46,8 +46,6 @@
 #include <QtGui/qvector3d.h>
 #include "qsoundinstance_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeSound;
@@ -150,6 +148,4 @@ private Q_SLOTS:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif

src/imports/audioengine/qsoundbuffer_p.h

@@ -44,8 +44,6 @@
 
 #include <QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QSoundBuffer : public QObject
@@ -65,6 +63,4 @@ protected:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSOUNDBUFFER_P_H

src/imports/audioengine/qsoundinstance_p.h

@@ -46,8 +46,6 @@
 #include <QObject>
 #include "qsoundsource_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeSound;
@@ -134,6 +132,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSOUNDINSTANCE_P_H

src/imports/audioengine/qsoundsource_p.h

@@ -45,8 +45,6 @@
 #include <QVector3D>
 #include <QObject>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QSoundBuffer;
@@ -93,6 +91,4 @@ protected:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif

src/imports/multimedia/qdeclarativeaudio_p.h

@@ -59,8 +59,6 @@
 
 #include <qmediaplayer.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QTimerEvent;
@@ -271,6 +269,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeAudio))
 
-QT_END_HEADER
-
 #endif

src/imports/multimedia/qdeclarativecamera_p.h

@@ -65,8 +65,6 @@
 #include <QtQml/qqmlparserstatus.h>
 #include <QtQml/qqml.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeCameraExposure;
@@ -312,6 +310,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCamera))
 
-QT_END_HEADER
-
 #endif

src/imports/multimedia/qdeclarativecameracapture_p.h

@@ -59,8 +59,6 @@
 
 #include <QtQml/qqml.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeCamera;
@@ -125,6 +123,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraCapture))
 
-QT_END_HEADER
-
 #endif

src/imports/multimedia/qdeclarativecameraexposure_p.h

@@ -57,8 +57,6 @@
 #include <qcamera.h>
 #include <qcameraexposure.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeCamera;
@@ -142,6 +140,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraExposure))
 
-QT_END_HEADER
-
 #endif

src/imports/multimedia/qdeclarativecameraflash_p.h

@@ -56,8 +56,6 @@
 #include <qcamera.h>
 #include <qcameraexposure.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeCamera;
@@ -91,6 +89,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraFlash))
 
-QT_END_HEADER
-
 #endif

src/imports/multimedia/qdeclarativecamerafocus_p.h

@@ -58,8 +58,6 @@
 #include <qcamerafocus.h>
 #include "qdeclarativecamera_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class FocusZonesModel;
@@ -131,6 +129,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraFocus))
 
-QT_END_HEADER
-
 #endif

src/imports/multimedia/qdeclarativecameraimageprocessing_p.h

@@ -56,8 +56,6 @@
 #include <qcamera.h>
 #include <qcameraimageprocessing.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeCamera;
@@ -127,6 +125,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraImageProcessing))
 
-QT_END_HEADER
-
 #endif

src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h

@@ -55,8 +55,6 @@
 
 #include <QtQuick/qquickimageprovider.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeCameraPreviewProvider : public QQuickImageProvider
@@ -71,6 +69,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif

src/imports/multimedia/qdeclarativecamerarecorder_p.h

@@ -57,8 +57,6 @@
 #include <qmediarecorder.h>
 #include <qmediaencodersettings.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeCamera;
@@ -227,6 +225,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeCameraRecorder))
 
-QT_END_HEADER
-
 #endif

src/imports/multimedia/qdeclarativemediametadata_p.h

@@ -56,8 +56,6 @@
 #include <QtQml/qqml.h>
 #include "qmediaobject.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeMediaMetaData : public QObject
@@ -179,6 +177,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeMediaMetaData))
 
-QT_END_HEADER
-
 #endif

src/imports/multimedia/qdeclarativeradio_p.h

@@ -56,8 +56,6 @@
 #include <qradiotuner.h>
 #include <QtQml/qqml.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeRadioData;
@@ -202,6 +200,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeRadio))
 
-QT_END_HEADER
-
 #endif // QDECLARATIVERADIO_P_H

src/imports/multimedia/qdeclarativeradiodata_p.h

@@ -57,8 +57,6 @@
 #include <qradiotuner.h>
 #include <QtQml/qqml.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeRadioData : public QObject
@@ -191,6 +189,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeRadioData))
 
-QT_END_HEADER
-
 #endif // QDECLARATIVERADIODATA_P_H

src/imports/multimedia/qdeclarativetorch_p.h

@@ -49,8 +49,6 @@
 #include <qcameraexposurecontrol.h>
 #include <qcameraflashcontrol.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeTorch : public QObject
@@ -88,6 +86,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QT_PREPEND_NAMESPACE(QDeclarativeTorch))
 
-QT_END_HEADER
-
 #endif // QDECLARATIVETORCH_P_H

src/multimedia/audio/audio.pri

@@ -39,7 +39,8 @@ SOURCES += \
            audio/qaudiodecoder.cpp \
            audio/qaudiohelpers.cpp
 
-mac {
+mac:!ios {
+
     PRIVATE_HEADERS +=  audio/qaudioinput_mac_p.h \
                 audio/qaudiooutput_mac_p.h \
                 audio/qaudiodeviceinfo_mac_p.h \
@@ -49,7 +50,6 @@ mac {
                audio/qaudiooutput_mac_p.cpp \
                audio/qaudioinput_mac_p.cpp \
                audio/qaudio_mac.cpp
-
     LIBS += -framework ApplicationServices -framework CoreAudio -framework AudioUnit -framework AudioToolbox
 }
 

src/multimedia/audio/qaudio.h

@@ -48,8 +48,6 @@
 
 #include <QtCore/qmetatype.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 //QTM_SYNC_HEADER_EXPORT QAudio
@@ -75,6 +73,4 @@ Q_DECLARE_METATYPE(QAudio::Error)
 Q_DECLARE_METATYPE(QAudio::State)
 Q_DECLARE_METATYPE(QAudio::Mode)
 
-QT_END_HEADER
-
 #endif // QAUDIO_H

src/multimedia/audio/qaudio_mac_p.h

@@ -61,8 +61,6 @@
 
 #include <qaudioformat.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 extern QAudioFormat toQAudioFormat(const AudioStreamBasicDescription& streamFormat);
@@ -132,8 +130,6 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif  // QAUDIO_MAC_P_H
 
 

src/multimedia/audio/qaudiobuffer.h

@@ -50,8 +50,6 @@
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qaudioformat.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QAbstractAudioBuffer;
@@ -152,6 +150,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QAudioBuffer)
 
-QT_END_HEADER
-
 #endif // QAUDIOBUFFER_H

src/multimedia/audio/qaudiobuffer_p.h

@@ -47,8 +47,6 @@
 
 #include "qaudioformat.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -86,6 +84,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QAUDIOBUFFER_P_H

src/multimedia/audio/qaudiodecoder.h

@@ -47,8 +47,6 @@
 
 #include <QtMultimedia/qaudiobuffer.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QAudioDecoderPrivate;
@@ -142,6 +140,4 @@ Q_DECLARE_METATYPE(QAudioDecoder::Error)
 Q_MEDIA_ENUM_DEBUG(QAudioDecoder, State)
 Q_MEDIA_ENUM_DEBUG(QAudioDecoder, Error)
 
-QT_END_HEADER
-
 #endif  // QAUDIODECODER_H

src/multimedia/audio/qaudiodevicefactory.cpp

@@ -52,7 +52,7 @@
 #include "qaudiodeviceinfo_win32_p.h"
 #include "qaudiooutput_win32_p.h"
 #include "qaudioinput_win32_p.h"
-#elif defined(Q_OS_MAC)
+#elif defined(Q_OS_MAC) && !defined(Q_OS_IOS)
 #include "qaudiodeviceinfo_mac_p.h"
 #include "qaudiooutput_mac_p.h"
 #include "qaudioinput_mac_p.h"
@@ -137,7 +137,7 @@ QList<QAudioDeviceInfo> QAudioDeviceFactory::availableDevices(QAudio::Mode mode)
 {
     QList<QAudioDeviceInfo> devices;
 #ifndef QT_NO_AUDIO_BACKEND
-#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
+#if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA))
     foreach (const QByteArray &handle, QAudioDeviceInfoInternal::availableDevices(mode))
         devices << QAudioDeviceInfo(QLatin1String("builtin"), handle, mode);
 #endif
@@ -170,7 +170,7 @@ QAudioDeviceInfo QAudioDeviceFactory::defaultInputDevice()
 #endif
 
 #ifndef QT_NO_AUDIO_BACKEND
-#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
+#if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA))
     return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultInputDevice(), QAudio::AudioInput);
 #endif
 #endif
@@ -190,7 +190,7 @@ QAudioDeviceInfo QAudioDeviceFactory::defaultOutputDevice()
 #endif
 
 #ifndef QT_NO_AUDIO_BACKEND
-#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
+#if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA))
     return QAudioDeviceInfo(QLatin1String("builtin"), QAudioDeviceInfoInternal::defaultOutputDevice(), QAudio::AudioOutput);
 #endif
 #endif
@@ -202,7 +202,7 @@ QAbstractAudioDeviceInfo* QAudioDeviceFactory::audioDeviceInfo(const QString &re
     QAbstractAudioDeviceInfo *rc = 0;
 
 #ifndef QT_NO_AUDIO_BACKEND
-#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
+#if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA))
     if (realm == QLatin1String("builtin"))
         return new QAudioDeviceInfoInternal(handle, mode);
 #endif
@@ -234,7 +234,7 @@ QAbstractAudioInput* QAudioDeviceFactory::createInputDevice(QAudioDeviceInfo con
     if (deviceInfo.isNull())
         return new QNullInputDevice();
 #ifndef QT_NO_AUDIO_BACKEND
-#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
+#if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS))  || defined(HAS_ALSA))
     if (deviceInfo.realm() == QLatin1String("builtin")) {
         QAbstractAudioInput* p = new QAudioInputPrivate(deviceInfo.handle());
         if (p) p->setFormat(format);
@@ -261,7 +261,7 @@ QAbstractAudioOutput* QAudioDeviceFactory::createOutputDevice(QAudioDeviceInfo c
     if (deviceInfo.isNull())
         return new QNullOutputDevice();
 #ifndef QT_NO_AUDIO_BACKEND
-#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(HAS_ALSA))
+#if (defined(Q_OS_WIN) || (defined(Q_OS_MAC) && !defined(Q_OS_IOS)) || defined(HAS_ALSA))
     if (deviceInfo.realm() == QLatin1String("builtin")) {
         QAbstractAudioOutput* p = new QAudioOutputPrivate(deviceInfo.handle());
         if (p) p->setFormat(format);

src/multimedia/audio/qaudiodevicefactory_p.h

@@ -61,8 +61,6 @@
 
 #include "qaudiodeviceinfo.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -92,7 +90,5 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QAUDIODEVICEFACTORY_P_H
 

src/multimedia/audio/qaudiodeviceinfo.h

@@ -55,8 +55,6 @@
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qaudioformat.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -110,6 +108,4 @@ QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QAudioDeviceInfo)
 
-QT_END_HEADER
-
 #endif // QAUDIODEVICEINFO_H

src/multimedia/audio/qaudiodeviceinfo_alsa_p.h

@@ -65,8 +65,6 @@
 #include "qaudiodeviceinfo.h"
 #include "qaudiosystem.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -120,8 +118,6 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif
 

src/multimedia/audio/qaudiodeviceinfo_mac_p.h

@@ -58,8 +58,6 @@
 
 #include <qaudiosystem.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -92,6 +90,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif  // QDEVICEINFO_MAC_P_H

src/multimedia/audio/qaudiodeviceinfo_win32_p.h

@@ -63,8 +63,6 @@
 #include <qaudiosystem.h>
 
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -112,7 +110,5 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif

src/multimedia/audio/qaudioformat.h

@@ -49,8 +49,6 @@
 #include <QtMultimedia/qtmultimediadefs.h>
 #include <QtMultimedia/qmultimedia.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QAudioFormatPrivate;
@@ -117,6 +115,4 @@ Q_DECLARE_METATYPE(QAudioFormat)
 Q_DECLARE_METATYPE(QAudioFormat::SampleType)
 Q_DECLARE_METATYPE(QAudioFormat::Endian)
 
-QT_END_HEADER
-
 #endif  // QAUDIOFORMAT_H

src/multimedia/audio/qaudioinput.h

@@ -53,8 +53,6 @@
 #include <QtMultimedia/qaudiodeviceinfo.h>
 
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -110,6 +108,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QAUDIOINPUT_H

src/multimedia/audio/qaudioinput_alsa_p.h

@@ -67,8 +67,6 @@
 #include "qaudiodeviceinfo.h"
 #include "qaudiosystem.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -186,7 +184,5 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif

src/multimedia/audio/qaudioinput_mac_p.h

@@ -68,8 +68,6 @@
 #include <qaudioformat.h>
 #include <qaudiosystem.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -172,6 +170,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QAUDIOINPUT_MAC_P_H

src/multimedia/audio/qaudioinput_win32_p.cpp

@@ -85,7 +85,7 @@ QAudioInputPrivate::~QAudioInputPrivate()
 }
 
 void QT_WIN_CALLBACK QAudioInputPrivate::waveInProc( HWAVEIN hWaveIn, UINT uMsg,
-        DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 )
+        DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 )
 {
     Q_UNUSED(dwParam1)
     Q_UNUSED(dwParam2)
@@ -197,7 +197,7 @@ void QAudioInputPrivate::setVolume(qreal volume)
             controlDetails.cMultipleItems = 0;
             controlDetails.cbDetails = sizeof(MIXERCONTROLDETAILS_UNSIGNED);
             controlDetails.paDetails = &controlDetailsUnsigned;
-            mixerSetControlDetails((HMIXEROBJ)mixerID, &controlDetails, MIXER_SETCONTROLDETAILSF_VALUE);
+            mixerSetControlDetails(mixerID, &controlDetails, MIXER_SETCONTROLDETAILSF_VALUE);
         }
     }
 }
@@ -221,7 +221,7 @@ qreal QAudioInputPrivate::volume() const
         controlDetails.paDetails = &detailsUnsigned;
         memset(controlDetails.paDetails, 0, controlDetails.cbDetails);
 
-        MMRESULT result = mixerGetControlDetails((HMIXEROBJ)mixerID, &controlDetails, MIXER_GETCONTROLDETAILSF_VALUE);
+        MMRESULT result = mixerGetControlDetails(mixerID, &controlDetails, MIXER_GETCONTROLDETAILSF_VALUE);
         if (result != MMSYSERR_NOERROR)
             continue;
         if (controlDetails.cbDetails < sizeof(MIXERCONTROLDETAILS_UNSIGNED))
@@ -431,14 +431,16 @@ void QAudioInputPrivate::initMixer()
         return;
 
     // Get the Mixer ID from the Sound Device ID
-    if (mixerGetID((HMIXEROBJ)inputDevice, &mixerID, MIXER_OBJECTF_WAVEIN) != MMSYSERR_NOERROR)
+    UINT mixerIntID = 0;
+    if (mixerGetID((HMIXEROBJ)(quintptr(inputDevice)), &mixerIntID, MIXER_OBJECTF_WAVEIN) != MMSYSERR_NOERROR)
         return;
+    mixerID = (HMIXEROBJ)mixerIntID;
 
     // Get the Destination (Recording) Line Infomation
     MIXERLINE mixerLine;
     mixerLine.cbStruct = sizeof(MIXERLINE);
     mixerLine.dwComponentType = MIXERLINE_COMPONENTTYPE_DST_WAVEIN;
-    if (mixerGetLineInfo((HMIXEROBJ)mixerID, &mixerLine, MIXER_GETLINEINFOF_COMPONENTTYPE) != MMSYSERR_NOERROR)
+    if (mixerGetLineInfo(mixerID, &mixerLine, MIXER_GETLINEINFOF_COMPONENTTYPE) != MMSYSERR_NOERROR)
         return;
 
     // Set all the Destination (Recording) Line Controls
@@ -448,7 +450,7 @@ void QAudioInputPrivate::initMixer()
         mixerLineControls.cControls = mixerLine.cControls;
         mixerLineControls.cbmxctrl = sizeof(MIXERCONTROL);
         mixerLineControls.pamxctrl = new MIXERCONTROL[mixerLineControls.cControls];
-        if (mixerGetLineControls((HMIXEROBJ)mixerID, &mixerLineControls, MIXER_GETLINECONTROLSF_ALL) != MMSYSERR_NOERROR)
+        if (mixerGetLineControls(mixerID, &mixerLineControls, MIXER_GETLINECONTROLSF_ALL) != MMSYSERR_NOERROR)
             closeMixer();
     }
 }

src/multimedia/audio/qaudioinput_win32_p.h

@@ -69,8 +69,6 @@
 #include <qaudiosystem.h>
 
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -141,7 +139,7 @@ private:
 
     QMutex mutex;
     static void QT_WIN_CALLBACK waveInProc( HWAVEIN hWaveIn, UINT uMsg,
-            DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 );
+            DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 );
 
     WAVEHDR* allocateBlocks(int size, int count);
     void freeBlocks(WAVEHDR* blockArray);
@@ -150,7 +148,7 @@ private:
 
     void initMixer();
     void closeMixer();
-    UINT mixerID;
+    HMIXEROBJ mixerID;
     MIXERLINECONTROLS mixerLineControls;
 
 private slots:
@@ -178,7 +176,5 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif

src/multimedia/audio/qaudiooutput.h

@@ -53,8 +53,6 @@
 #include <QtMultimedia/qaudiodeviceinfo.h>
 
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -113,6 +111,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QAUDIOOUTPUT_H

src/multimedia/audio/qaudiooutput_alsa_p.h

@@ -66,8 +66,6 @@
 #include "qaudiodeviceinfo.h"
 #include "qaudiosystem.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -171,7 +169,5 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif

src/multimedia/audio/qaudiooutput_mac_p.h

@@ -68,8 +68,6 @@
 #include <qaudioformat.h>
 #include <qaudiosystem.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -171,6 +169,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif

src/multimedia/audio/qaudiooutput_win32_p.cpp

@@ -131,7 +131,7 @@ QAudioOutputPrivate::~QAudioOutputPrivate()
 }
 
 void CALLBACK QAudioOutputPrivate::waveOutProc( HWAVEOUT hWaveOut, UINT uMsg,
-        DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 )
+        DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 )
 {
     Q_UNUSED(dwParam1)
     Q_UNUSED(dwParam2)

src/multimedia/audio/qaudiooutput_win32_p.h

@@ -76,8 +76,6 @@
 #  endif
 #endif
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -134,7 +132,7 @@ private:
     int intervalTime;
     qreal volumeCache;
     static void QT_WIN_CALLBACK waveOutProc( HWAVEOUT hWaveOut, UINT uMsg,
-            DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 );
+            DWORD_PTR dwInstance, DWORD_PTR dwParam1, DWORD_PTR dwParam2 );
 
     QMutex mutex;
 
@@ -170,7 +168,5 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif

src/multimedia/audio/qaudioprobe.h

@@ -45,8 +45,6 @@
 #include <QtCore/qobject.h>
 #include <QtMultimedia/qaudiobuffer.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QMediaObject;
@@ -75,6 +73,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QAUDIOPROBE_H

src/multimedia/audio/qaudiosystem.h

@@ -49,8 +49,6 @@
 #include <QtMultimedia/qaudioformat.h>
 #include <QtMultimedia/qaudiodeviceinfo.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -140,6 +138,4 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QAUDIOSYSTEM_H

src/multimedia/audio/qaudiosystemplugin.h

@@ -53,8 +53,6 @@
 #include <QtMultimedia/qaudiodeviceinfo.h>
 #include <QtMultimedia/qaudiosystem.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -93,6 +91,4 @@ public:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QAUDIOSYSTEMPLUGIN_H

src/multimedia/audio/qsamplecache_p.h

@@ -62,8 +62,6 @@
 #include <qaudioformat.h>
 
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QIODevice;
@@ -165,6 +163,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSAMPLECACHE_P_H

src/multimedia/audio/qsound.h

@@ -45,8 +45,6 @@
 #include <QtMultimedia/qtmultimediadefs.h>
 #include <QtCore/qobject.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QSoundEffect;
@@ -85,7 +83,5 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif // QSOUND_H

src/multimedia/audio/qsoundeffect.h

@@ -48,8 +48,6 @@
 #include <QtCore/qstringlist.h>
 
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -132,7 +130,5 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif // QSOUNDEFFECT_H

src/multimedia/audio/qsoundeffect_pulse_p.h

@@ -62,8 +62,6 @@
 #include <pulse/pulseaudio.h>
 #include "qsamplecache_p.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QSoundEffectRef;
@@ -169,6 +167,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSOUNDEFFECT_PULSE_H

src/multimedia/audio/qsoundeffect_qaudio_p.h

@@ -59,8 +59,6 @@
 #include "qsamplecache_p.h"
 #include "qsoundeffect.h"
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QSoundEffectPrivate;
@@ -151,6 +149,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QSOUNDEFFECT_QAUDIO_H

src/multimedia/audio/qwavedecoder_p.h

@@ -57,8 +57,6 @@
 #include <qaudioformat.h>
 
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -134,6 +132,4 @@ private:
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // WAVEDECODER_H

src/multimedia/camera/qcamera.h

@@ -58,8 +58,6 @@
 
 #include <QtMultimedia/qmediaenumdebug.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -234,6 +232,4 @@ Q_MEDIA_ENUM_DEBUG(QCamera, LockType)
 Q_MEDIA_ENUM_DEBUG(QCamera, LockStatus)
 Q_MEDIA_ENUM_DEBUG(QCamera, LockChangeReason)
 
-QT_END_HEADER
-
 #endif  // QCAMERA_H

src/multimedia/camera/qcameraexposure.h

@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediaobject.h>
 #include <QtMultimedia/qmediaenumdebug.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -183,6 +181,4 @@ Q_MEDIA_ENUM_DEBUG(QCameraExposure, ExposureMode)
 Q_MEDIA_ENUM_DEBUG(QCameraExposure, FlashMode)
 Q_MEDIA_ENUM_DEBUG(QCameraExposure, MeteringMode)
 
-QT_END_HEADER
-
 #endif // QCAMERAEXPOSURE_H

src/multimedia/camera/qcamerafocus.h

@@ -52,8 +52,6 @@
 #include <QtMultimedia/qmediaobject.h>
 #include <QtMultimedia/qmediaenumdebug.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -176,6 +174,4 @@ Q_DECLARE_METATYPE(QCameraFocus::FocusPointMode)
 Q_MEDIA_ENUM_DEBUG(QCameraFocus, FocusMode)
 Q_MEDIA_ENUM_DEBUG(QCameraFocus, FocusPointMode)
 
-QT_END_HEADER
-
 #endif  // QCAMERAFOCUS_H

src/multimedia/camera/qcameraimagecapture.h

@@ -49,8 +49,6 @@
 
 #include <QtMultimedia/qmediaenumdebug.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QSize;
@@ -161,7 +159,5 @@ Q_DECLARE_METATYPE(QCameraImageCapture::CaptureDestinations)
 Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, Error)
 Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, CaptureDestination)
 
-QT_END_HEADER
-
 #endif
 

src/multimedia/camera/qcameraimageprocessing.h

@@ -53,8 +53,6 @@
 #include <QtMultimedia/qmediaservice.h>
 #include <QtMultimedia/qmediaenumdebug.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -116,6 +114,4 @@ Q_DECLARE_METATYPE(QCameraImageProcessing::WhiteBalanceMode)
 
 Q_MEDIA_ENUM_DEBUG(QCameraImageProcessing, WhiteBalanceMode)
 
-QT_END_HEADER
-
 #endif  // QCAMERAIMAGEPROCESSING_H

src/multimedia/controls/qaudiodecodercontrol.h

@@ -49,8 +49,6 @@
 
 #include <QtMultimedia/qaudiobuffer.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QIODevice;
@@ -104,6 +102,4 @@ Q_MEDIA_DECLARE_CONTROL(QAudioDecoderControl, QAudioDecoderControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif  // QAUDIODECODERCONTROL_H

src/multimedia/controls/qaudioencodersettingscontrol.h

@@ -47,8 +47,6 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qpair.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QStringList;
@@ -85,7 +83,5 @@ Q_MEDIA_DECLARE_CONTROL(QAudioEncoderSettingsControl, QAudioEncoderSettingsContr
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif // QAUDIOENCODERSETTINGSCONTROL_H

src/multimedia/controls/qaudioinputselectorcontrol.h

@@ -45,8 +45,6 @@
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qmediacontrol.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -80,7 +78,5 @@ Q_MEDIA_DECLARE_CONTROL(QAudioInputSelectorControl, QAudioInputSelectorControl_i
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif // QAUDIOINPUTSELECTORCONTROL_H

src/multimedia/controls/qaudiooutputselectorcontrol.h

@@ -45,8 +45,6 @@
 #include <QtMultimedia/qaudio.h>
 #include <QtMultimedia/qmediacontrol.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -80,7 +78,5 @@ Q_MEDIA_DECLARE_CONTROL(QAudioOutputSelectorControl, QAudioOutputSelectorControl
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif // QAUDIOOUTPUTSELECTORCONTROL_H

src/multimedia/controls/qcameracapturebufferformatcontrol.h

@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qcameraimagecapture.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -74,8 +72,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraCaptureBufferFormatControl, QCameraCaptureBufferF
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif
 

src/multimedia/controls/qcameracapturedestinationcontrol.h

@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qcameraimagecapture.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -74,8 +72,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraCaptureDestinationControl, QCameraCaptureDestinat
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif
 

src/multimedia/controls/qcameracontrol.h

@@ -47,8 +47,6 @@
 
 #include <QtMultimedia/qcamera.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -94,8 +92,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraControl, QCameraControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif  // QCAMERACONTROL_H
 

src/multimedia/controls/qcameraexposurecontrol.h

@@ -49,8 +49,6 @@
 #include <QtMultimedia/qcamera.h>
 #include <QtMultimedia/qmediaenumdebug.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -103,8 +101,6 @@ Q_DECLARE_METATYPE(QCameraExposureControl::ExposureParameter)
 
 Q_MEDIA_ENUM_DEBUG(QCameraExposureControl, ExposureParameter)
 
-QT_END_HEADER
-
 
 #endif  // QCAMERAEXPOSURECONTROL_H
 

src/multimedia/controls/qcamerafeedbackcontrol.h

@@ -50,8 +50,6 @@
 #include <QtMultimedia/qcamera.h>
 #include <QtMultimedia/qmediaenumdebug.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -96,7 +94,5 @@ Q_MEDIA_DECLARE_CONTROL(QCameraFeedbackControl, QCameraFeedbackControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif // QCAMERAFEEDBACKCONTROL_H

src/multimedia/controls/qcameraflashcontrol.h

@@ -48,8 +48,6 @@
 #include <QtMultimedia/qcameraexposure.h>
 #include <QtMultimedia/qcamera.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -80,8 +78,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraFlashControl, QCameraFlashControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif  // QCAMERAFLASHCONTROL_H
 

src/multimedia/controls/qcamerafocuscontrol.h

@@ -47,8 +47,6 @@
 
 #include <QtMultimedia/qcamerafocus.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -89,8 +87,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraFocusControl, QCameraFocusControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif  // QCAMERAFOCUSCONTROL_H
 

src/multimedia/controls/qcameraimagecapturecontrol.h

@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qcameraimagecapture.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QImage;
@@ -92,8 +90,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraImageCaptureControl, QCameraImageCaptureControl_i
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif  // QCAMERAIMAGECAPTURECONTROL_H
 

src/multimedia/controls/qcameraimageprocessingcontrol.h

@@ -48,8 +48,6 @@
 #include <QtMultimedia/qcamera.h>
 #include <QtMultimedia/qmediaenumdebug.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -97,7 +95,5 @@ Q_DECLARE_METATYPE(QCameraImageProcessingControl::ProcessingParameter)
 
 Q_MEDIA_ENUM_DEBUG(QCameraImageProcessingControl, ProcessingParameter)
 
-QT_END_HEADER
-
 #endif
 

src/multimedia/controls/qcameralockscontrol.h

@@ -47,8 +47,6 @@
 
 #include <QtMultimedia/qcamera.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -79,8 +77,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraLocksControl, QCameraLocksControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif  // QCAMERALOCKSCONTROL_H
 

src/multimedia/controls/qcameraviewfindersettingscontrol.h

@@ -46,8 +46,6 @@
 
 #include <QtMultimedia/qmediacontrol.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -81,6 +79,4 @@ Q_MEDIA_DECLARE_CONTROL(QCameraViewfinderSettingsControl, QCameraViewfinderSetti
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QCAMERAVIEWFINDERSETTINGSCONTROL_H

src/multimedia/controls/qcamerazoomcontrol.h

@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qmediaobject.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -87,6 +85,4 @@ Q_MEDIA_DECLARE_CONTROL(QCameraZoomControl, QCameraZoomControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif  // QCAMERAZOOMCONTROL_H

src/multimedia/controls/qimageencodercontrol.h

@@ -48,8 +48,6 @@
 
 #include <QtCore/qsize.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QByteArray;
@@ -86,7 +84,5 @@ Q_MEDIA_DECLARE_CONTROL(QImageEncoderControl, QImageEncoderControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif

src/multimedia/controls/qmediaaudioprobecontrol.h

@@ -44,8 +44,6 @@
 
 #include <QtMultimedia/qmediacontrol.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QAudioBuffer;
@@ -68,7 +66,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaAudioProbeControl, QMediaAudioProbeControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif // QMEDIAAUDIOPROBECONTROL_H

src/multimedia/controls/qmediaavailabilitycontrol.h

@@ -46,8 +46,6 @@
 #include <QtMultimedia/qmediaobject.h>
 #include <QtMultimedia/qmultimedia.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -74,6 +72,4 @@ Q_MEDIA_DECLARE_CONTROL(QMediaAvailabilityControl, QMediaAvailabilityControl_iid
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QMEDIAAVAILABILITYCONTROL_H

src/multimedia/controls/qmediacontainercontrol.h

@@ -45,8 +45,6 @@
 
 #include <QtMultimedia/qmediacontrol.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -74,7 +72,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaContainerControl, QMediaContainerControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif // QMEDIACONTAINERCONTROL_H

src/multimedia/controls/qmediagaplessplaybackcontrol.h

@@ -44,8 +44,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qmediacontent.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -78,6 +76,4 @@ Q_MEDIA_DECLARE_CONTROL(QMediaGaplessPlaybackControl, QMediaGaplessPlaybackContr
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QMEDIAGAPLESSPLAYBACKCONTROL_H

src/multimedia/controls/qmedianetworkaccesscontrol.h

@@ -48,8 +48,6 @@
 #include <QtCore/qlist.h>
 #include <QtNetwork/qnetworkconfiguration.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -77,7 +75,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaNetworkAccessControl, QMediaNetworkAccessControl_i
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif

src/multimedia/controls/qmediaplayercontrol.h

@@ -48,8 +48,6 @@
 
 #include <QtCore/qpair.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -122,8 +120,6 @@ Q_MEDIA_DECLARE_CONTROL(QMediaPlayerControl, QMediaPlayerControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif  // QMEDIAPLAYERCONTROL_H
 

src/multimedia/controls/qmediaplaylistcontrol_p.h

@@ -59,8 +59,6 @@
 #include <private/qmediaplaylistnavigator_p.h>
 
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -102,7 +100,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistControl, QMediaPlaylistControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif // QMEDIAPLAYLISTCONTROL_P_H

src/multimedia/controls/qmediaplaylistsourcecontrol_p.h

@@ -56,8 +56,6 @@
 
 #include <qmediacontrol.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 
@@ -85,7 +83,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaPlaylistSourceControl, QMediaPlaylistSourceControl
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif // QMEDIAPLAYLISTCONTROL_P_H

src/multimedia/controls/qmediarecordercontrol.h

@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qmediarecorder.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QUrl;
@@ -100,7 +98,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaRecorderControl, QMediaRecorderControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif

src/multimedia/controls/qmediastreamscontrol.h

@@ -48,8 +48,6 @@
 #include <QtMultimedia/qtmultimediadefs.h>
 #include <QtMultimedia/qmediaenumdebug.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -89,7 +87,5 @@ Q_DECLARE_METATYPE(QMediaStreamsControl::StreamType)
 
 Q_MEDIA_ENUM_DEBUG(QMediaStreamsControl, StreamType)
 
-QT_END_HEADER
-
 #endif // QMEDIASTREAMSCONTROL_H
 

src/multimedia/controls/qmediavideoprobecontrol.h

@@ -46,8 +46,6 @@
 
 #include <QtMultimedia/qmediacontrol.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QVideoFrame;
@@ -70,7 +68,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaVideoProbeControl, QMediaVideoProbeControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif // QMEDIAVIDEOPROBECONTROL_H

src/multimedia/controls/qmetadatareadercontrol.h

@@ -50,8 +50,6 @@
 #include <QtMultimedia/qtmultimediadefs.h>
 #include <QtMultimedia/qmultimedia.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -83,7 +81,5 @@ Q_MEDIA_DECLARE_CONTROL(QMetaDataReaderControl, QMetaDataReaderControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif  // QMETADATAPROVIDER_H

src/multimedia/controls/qmetadatawritercontrol.h

@@ -50,8 +50,6 @@
 #include <QtMultimedia/qtmultimediadefs.h>
 #include <QtMultimedia/qmultimedia.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -86,7 +84,5 @@ Q_MEDIA_DECLARE_CONTROL(QMetaDataWriterControl, QMetaDataWriterControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif

src/multimedia/controls/qradiodatacontrol.h

@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qradiodata.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -88,7 +86,5 @@ Q_MEDIA_DECLARE_CONTROL(QRadioDataControl, QRadioDataControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif  // QRADIODATACONTROL_H

src/multimedia/controls/qradiotunercontrol.h

@@ -45,8 +45,6 @@
 #include <QtMultimedia/qmediacontrol.h>
 #include <QtMultimedia/qradiotuner.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -119,7 +117,5 @@ Q_MEDIA_DECLARE_CONTROL(QRadioTunerControl, QRadioTunerControl_iid)
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif  // QRADIOTUNERCONTROL_H

src/multimedia/controls/qvideodeviceselectorcontrol.h

@@ -44,8 +44,6 @@
 
 #include <QtMultimedia/qmediacontrol.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 // Required for QDoc workaround
@@ -83,6 +81,4 @@ Q_MEDIA_DECLARE_CONTROL(QVideoDeviceSelectorControl, QVideoDeviceSelectorControl
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 #endif // QVIDEODEVICESELECTORCONTROL_H

src/multimedia/controls/qvideoencodersettingscontrol.h

@@ -48,8 +48,6 @@
 #include <QtCore/qpair.h>
 #include <QtCore/qsize.h>
 
-QT_BEGIN_HEADER
-
 QT_BEGIN_NAMESPACE
 
 class QByteArray;
@@ -89,7 +87,5 @@ Q_MEDIA_DECLARE_CONTROL(QVideoEncoderSettingsControl, QVideoEncoderSettingsContr
 
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
 
 #endif