From 97177277a2fcca974d7599ab8ea12ad80ab30efc Mon Sep 17 00:00:00 2001
From: Val Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Mon, 2 Sep 2019 14:37:39 +0200
Subject: Include moc files after QT_END_NAMESPACE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: QTBUG-76574
Change-Id: I69ef47bbd01967c3d7a0c5d1554fcdd29619ebfa
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
---
 src/multimedia/audio/qaudiodecoder.cpp                        | 2 +-
 src/multimedia/camera/qcameraexposure.cpp                     | 3 ++-
 src/multimedia/camera/qcamerafocus.cpp                        | 2 +-
 src/multimedia/camera/qcameraimagecapture.cpp                 | 3 +--
 src/multimedia/controls/qaudiodecodercontrol.cpp              | 2 +-
 src/multimedia/controls/qaudioencodersettingscontrol.cpp      | 2 +-
 src/multimedia/controls/qaudioinputselectorcontrol.cpp        | 2 +-
 src/multimedia/controls/qaudiooutputselectorcontrol.cpp       | 2 +-
 src/multimedia/controls/qaudiorolecontrol.cpp                 | 2 +-
 src/multimedia/controls/qcameracapturebufferformatcontrol.cpp | 2 +-
 src/multimedia/controls/qcameracapturedestinationcontrol.cpp  | 2 +-
 src/multimedia/controls/qcameracontrol.cpp                    | 3 ++-
 src/multimedia/controls/qcameraexposurecontrol.cpp            | 3 +--
 src/multimedia/controls/qcameraflashcontrol.cpp               | 2 +-
 src/multimedia/controls/qcamerafocuscontrol.cpp               | 2 +-
 src/multimedia/controls/qcameraimagecapturecontrol.cpp        | 2 +-
 src/multimedia/controls/qcameraimageprocessingcontrol.cpp     | 2 +-
 src/multimedia/controls/qcamerainfocontrol.cpp                | 4 ++--
 src/multimedia/controls/qcameraviewfindersettingscontrol.cpp  | 2 +-
 src/multimedia/controls/qcamerazoomcontrol.cpp                | 2 +-
 src/multimedia/controls/qcustomaudiorolecontrol.cpp           | 3 ++-
 src/multimedia/controls/qimageencodercontrol.cpp              | 2 +-
 src/multimedia/controls/qmediaaudioprobecontrol.cpp           | 4 ++--
 src/multimedia/controls/qmediaavailabilitycontrol.cpp         | 3 ++-
 src/multimedia/controls/qmediacontainercontrol.cpp            | 2 +-
 src/multimedia/controls/qmedianetworkaccesscontrol.cpp        | 3 +--
 src/multimedia/controls/qmediaplayercontrol.cpp               | 2 +-
 src/multimedia/controls/qmediaplaylistcontrol.cpp             | 2 +-
 src/multimedia/controls/qmediaplaylistsourcecontrol.cpp       | 2 +-
 src/multimedia/controls/qmediarecordercontrol.cpp             | 2 +-
 src/multimedia/controls/qmediastreamscontrol.cpp              | 2 +-
 src/multimedia/controls/qmediavideoprobecontrol.cpp           | 4 ++--
 src/multimedia/controls/qmetadatareadercontrol.cpp            | 2 +-
 src/multimedia/controls/qmetadatawritercontrol.cpp            | 2 +-
 src/multimedia/controls/qradiodatacontrol.cpp                 | 2 +-
 src/multimedia/controls/qvideodeviceselectorcontrol.cpp       | 2 +-
 src/multimedia/controls/qvideoencodersettingscontrol.cpp      | 2 +-
 src/multimedia/controls/qvideorenderercontrol.cpp             | 2 +-
 src/multimedia/controls/qvideowindowcontrol.cpp               | 2 +-
 src/multimedia/playback/qmedianetworkplaylistprovider.cpp     | 3 +--
 src/multimedia/playback/qmediaplayer.cpp                      | 2 +-
 src/multimedia/playback/qmediaplaylist.cpp                    | 4 ++--
 src/multimedia/playback/qmediaplaylistioplugin.cpp            | 2 +-
 src/multimedia/playback/qmediaplaylistnavigator.cpp           | 2 +-
 src/multimedia/playback/qmediaplaylistprovider.cpp            | 2 +-
 src/multimedia/qmediacontrol.cpp                              | 2 +-
 src/multimedia/qmediaobject.cpp                               | 3 +--
 src/multimedia/qmediaservice.cpp                              | 3 +--
 src/multimedia/qmediaserviceprovider.cpp                      | 4 ++--
 src/multimedia/radio/qradiodata.cpp                           | 2 +-
 src/multimedia/radio/qradiotuner.cpp                          | 2 +-
 src/multimedia/recording/qaudiorecorder.cpp                   | 4 +---
 src/multimedia/recording/qmediarecorder.cpp                   | 2 +-
 src/multimediawidgets/qgraphicsvideoitem.cpp                  | 3 ++-
 src/multimediawidgets/qpaintervideosurface.cpp                | 3 +--
 src/multimediawidgets/qvideowidget.cpp                        | 4 ++--
 src/multimediawidgets/qvideowidgetcontrol.cpp                 | 2 +-
 57 files changed, 68 insertions(+), 72 deletions(-)

(limited to 'src')

diff --git a/src/multimedia/audio/qaudiodecoder.cpp b/src/multimedia/audio/qaudiodecoder.cpp
index b4ba854e1..0286e9a85 100644
--- a/src/multimedia/audio/qaudiodecoder.cpp
+++ b/src/multimedia/audio/qaudiodecoder.cpp
@@ -545,6 +545,6 @@ QAudioBuffer QAudioDecoder::read() const
     \brief whether there is a decoded audio buffer available
 */
 
-#include "moc_qaudiodecoder.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qaudiodecoder.cpp"
diff --git a/src/multimedia/camera/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp
index 91950c7d2..022dea28c 100644
--- a/src/multimedia/camera/qcameraexposure.cpp
+++ b/src/multimedia/camera/qcameraexposure.cpp
@@ -702,5 +702,6 @@ void QCameraExposure::setAutoShutterSpeed()
     Signal emitted when the exposure compensation changes to \a value.
 */
 
-#include "moc_qcameraexposure.cpp"
 QT_END_NAMESPACE
+
+#include "moc_qcameraexposure.cpp"
diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp
index e73a8ea46..33e280205 100644
--- a/src/multimedia/camera/qcamerafocus.cpp
+++ b/src/multimedia/camera/qcamerafocus.cpp
@@ -613,6 +613,6 @@ void QCameraFocus::zoomTo(qreal optical, qreal digital)
   have been detected.
 */
 
+QT_END_NAMESPACE
 
 #include "moc_qcamerafocus.cpp"
-QT_END_NAMESPACE
diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp
index 8f364a686..502812f76 100644
--- a/src/multimedia/camera/qcameraimagecapture.cpp
+++ b/src/multimedia/camera/qcameraimagecapture.cpp
@@ -643,7 +643,6 @@ void QCameraImageCapture::cancelCapture()
     Signal emitted when the frame with request \a id was saved to \a fileName.
 */
 
-
-#include "moc_qcameraimagecapture.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qcameraimagecapture.cpp"
diff --git a/src/multimedia/controls/qaudiodecodercontrol.cpp b/src/multimedia/controls/qaudiodecodercontrol.cpp
index 09448ca41..4d6d36a2f 100644
--- a/src/multimedia/controls/qaudiodecodercontrol.cpp
+++ b/src/multimedia/controls/qaudiodecodercontrol.cpp
@@ -261,6 +261,6 @@ QAudioDecoderControl::QAudioDecoderControl(QObject *parent):
     or -1 if not available.
 */
 
-#include "moc_qaudiodecodercontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qaudiodecodercontrol.cpp"
diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.cpp b/src/multimedia/controls/qaudioencodersettingscontrol.cpp
index ad0437c6e..42f20201c 100644
--- a/src/multimedia/controls/qaudioencodersettingscontrol.cpp
+++ b/src/multimedia/controls/qaudioencodersettingscontrol.cpp
@@ -134,6 +134,6 @@ QAudioEncoderSettingsControl::~QAudioEncoderSettingsControl()
     Sets the selected audio \a settings.
 */
 
-#include "moc_qaudioencodersettingscontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qaudioencodersettingscontrol.cpp"
diff --git a/src/multimedia/controls/qaudioinputselectorcontrol.cpp b/src/multimedia/controls/qaudioinputselectorcontrol.cpp
index 7f32de3e4..0f8843808 100644
--- a/src/multimedia/controls/qaudioinputselectorcontrol.cpp
+++ b/src/multimedia/controls/qaudioinputselectorcontrol.cpp
@@ -125,6 +125,6 @@ QAudioInputSelectorControl::~QAudioInputSelectorControl()
     Signals that list of available inputs has changed.
 */
 
-#include "moc_qaudioinputselectorcontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qaudioinputselectorcontrol.cpp"
diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.cpp b/src/multimedia/controls/qaudiooutputselectorcontrol.cpp
index 728ec22ce..20c792f8d 100644
--- a/src/multimedia/controls/qaudiooutputselectorcontrol.cpp
+++ b/src/multimedia/controls/qaudiooutputselectorcontrol.cpp
@@ -125,6 +125,6 @@ QAudioOutputSelectorControl::~QAudioOutputSelectorControl()
     Signals that list of available outputs has changed.
 */
 
-#include "moc_qaudiooutputselectorcontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qaudiooutputselectorcontrol.cpp"
diff --git a/src/multimedia/controls/qaudiorolecontrol.cpp b/src/multimedia/controls/qaudiorolecontrol.cpp
index 0ea2aea53..7b2341846 100644
--- a/src/multimedia/controls/qaudiorolecontrol.cpp
+++ b/src/multimedia/controls/qaudiorolecontrol.cpp
@@ -112,6 +112,6 @@ QAudioRoleControl::~QAudioRoleControl()
     Signal emitted when the audio \a role has changed.
  */
 
+QT_END_NAMESPACE
 
 #include "moc_qaudiorolecontrol.cpp"
-QT_END_NAMESPACE
diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp
index e513e1416..553414681 100644
--- a/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp
+++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.cpp
@@ -107,6 +107,6 @@ QCameraCaptureBufferFormatControl::~QCameraCaptureBufferFormatControl()
     Signals the buffer image capture format changed to \a format.
 */
 
-#include "moc_qcameracapturebufferformatcontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qcameracapturebufferformatcontrol.cpp"
diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.cpp b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp
index e3ec10374..e037ab5a9 100644
--- a/src/multimedia/controls/qcameracapturedestinationcontrol.cpp
+++ b/src/multimedia/controls/qcameracapturedestinationcontrol.cpp
@@ -109,6 +109,6 @@ QCameraCaptureDestinationControl::~QCameraCaptureDestinationControl()
     Signals the image capture \a destination changed.
 */
 
-#include "moc_qcameracapturedestinationcontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qcameracapturedestinationcontrol.cpp"
diff --git a/src/multimedia/controls/qcameracontrol.cpp b/src/multimedia/controls/qcameracontrol.cpp
index 0e562c853..03a7a073c 100644
--- a/src/multimedia/controls/qcameracontrol.cpp
+++ b/src/multimedia/controls/qcameracontrol.cpp
@@ -199,5 +199,6 @@ QCameraControl::~QCameraControl()
   \value ViewfinderSettings Viewfinder settings are changed.
 */
 
-#include "moc_qcameracontrol.cpp"
 QT_END_NAMESPACE
+
+#include "moc_qcameracontrol.cpp"
diff --git a/src/multimedia/controls/qcameraexposurecontrol.cpp b/src/multimedia/controls/qcameraexposurecontrol.cpp
index c13be0d5d..1434f0976 100644
--- a/src/multimedia/controls/qcameraexposurecontrol.cpp
+++ b/src/multimedia/controls/qcameraexposurecontrol.cpp
@@ -201,7 +201,6 @@ QCameraExposureControl::~QCameraExposureControl()
     \since 5.0
 */
 
-
-#include "moc_qcameraexposurecontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qcameraexposurecontrol.cpp"
diff --git a/src/multimedia/controls/qcameraflashcontrol.cpp b/src/multimedia/controls/qcameraflashcontrol.cpp
index d77984dad..d5d9b564f 100644
--- a/src/multimedia/controls/qcameraflashcontrol.cpp
+++ b/src/multimedia/controls/qcameraflashcontrol.cpp
@@ -128,6 +128,6 @@ QCameraFlashControl::~QCameraFlashControl()
     Signal emitted when flash state changes to \a ready.
 */
 
-#include "moc_qcameraflashcontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qcameraflashcontrol.cpp"
diff --git a/src/multimedia/controls/qcamerafocuscontrol.cpp b/src/multimedia/controls/qcamerafocuscontrol.cpp
index 6884ab617..d963c95d4 100644
--- a/src/multimedia/controls/qcamerafocuscontrol.cpp
+++ b/src/multimedia/controls/qcamerafocuscontrol.cpp
@@ -192,6 +192,6 @@ QCameraFocusControl::~QCameraFocusControl()
 
 
 
-#include "moc_qcamerafocuscontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qcamerafocuscontrol.cpp"
diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.cpp b/src/multimedia/controls/qcameraimagecapturecontrol.cpp
index bfc973aba..3c110eb68 100644
--- a/src/multimedia/controls/qcameraimagecapturecontrol.cpp
+++ b/src/multimedia/controls/qcameraimagecapturecontrol.cpp
@@ -189,6 +189,6 @@ QCameraImageCaptureControl::~QCameraImageCaptureControl()
 */
 
 
-#include "moc_qcameraimagecapturecontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qcameraimagecapturecontrol.cpp"
diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp
index a72fc7bb5..a39846642 100644
--- a/src/multimedia/controls/qcameraimageprocessingcontrol.cpp
+++ b/src/multimedia/controls/qcameraimageprocessingcontrol.cpp
@@ -183,6 +183,6 @@ QCameraImageProcessingControl::~QCameraImageProcessingControl()
     The base value for platform specific extended parameters.
  */
 
-#include "moc_qcameraimageprocessingcontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qcameraimageprocessingcontrol.cpp"
diff --git a/src/multimedia/controls/qcamerainfocontrol.cpp b/src/multimedia/controls/qcamerainfocontrol.cpp
index e69e0c3eb..de6dc4277 100644
--- a/src/multimedia/controls/qcamerainfocontrol.cpp
+++ b/src/multimedia/controls/qcamerainfocontrol.cpp
@@ -97,6 +97,6 @@ QCameraInfoControl::~QCameraInfoControl()
     in relation to the display in its natural orientation.
 */
 
-#include "moc_qcamerainfocontrol.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qcamerainfocontrol.cpp"
diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp
index c7610dd8f..6fa0ded82 100644
--- a/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp
+++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.cpp
@@ -200,6 +200,6 @@ QCameraViewfinderSettingsControl2::~QCameraViewfinderSettingsControl2()
     Sets the camera viewfinder \a settings.
 */
 
-#include "moc_qcameraviewfindersettingscontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qcameraviewfindersettingscontrol.cpp"
diff --git a/src/multimedia/controls/qcamerazoomcontrol.cpp b/src/multimedia/controls/qcamerazoomcontrol.cpp
index 9a3de0542..9c8d8d289 100644
--- a/src/multimedia/controls/qcamerazoomcontrol.cpp
+++ b/src/multimedia/controls/qcamerazoomcontrol.cpp
@@ -182,6 +182,6 @@ QCameraZoomControl::~QCameraZoomControl()
     like capture mode or resolution.
 */
 
-#include "moc_qcamerazoomcontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qcamerazoomcontrol.cpp"
diff --git a/src/multimedia/controls/qcustomaudiorolecontrol.cpp b/src/multimedia/controls/qcustomaudiorolecontrol.cpp
index 39431be01..046219687 100644
--- a/src/multimedia/controls/qcustomaudiorolecontrol.cpp
+++ b/src/multimedia/controls/qcustomaudiorolecontrol.cpp
@@ -113,5 +113,6 @@ QCustomAudioRoleControl::~QCustomAudioRoleControl()
     Signal emitted when the audio \a role has changed.
  */
 
-#include "moc_qcustomaudiorolecontrol.cpp"
 QT_END_NAMESPACE
+
+#include "moc_qcustomaudiorolecontrol.cpp"
diff --git a/src/multimedia/controls/qimageencodercontrol.cpp b/src/multimedia/controls/qimageencodercontrol.cpp
index 1d5c23441..c29a61662 100644
--- a/src/multimedia/controls/qimageencodercontrol.cpp
+++ b/src/multimedia/controls/qimageencodercontrol.cpp
@@ -131,6 +131,6 @@ QImageEncoderControl::~QImageEncoderControl()
     Sets the selected image encoder \a settings.
 */
 
-#include "moc_qimageencodercontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qimageencodercontrol.cpp"
diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.cpp b/src/multimedia/controls/qmediaaudioprobecontrol.cpp
index f71763c96..296f01888 100644
--- a/src/multimedia/controls/qmediaaudioprobecontrol.cpp
+++ b/src/multimedia/controls/qmediaaudioprobecontrol.cpp
@@ -97,6 +97,6 @@ QMediaAudioProbeControl::~QMediaAudioProbeControl()
     This signal should be emitted when it is required to release all frames.
 */
 
-#include "moc_qmediaaudioprobecontrol.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qmediaaudioprobecontrol.cpp"
diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.cpp b/src/multimedia/controls/qmediaavailabilitycontrol.cpp
index 163d71a3f..1a6d73a8a 100644
--- a/src/multimedia/controls/qmediaavailabilitycontrol.cpp
+++ b/src/multimedia/controls/qmediaavailabilitycontrol.cpp
@@ -103,5 +103,6 @@ QMediaAvailabilityControl::~QMediaAvailabilityControl()
     Signal emitted when the current \a availability value changed.
 */
 
-#include "moc_qmediaavailabilitycontrol.cpp"
 QT_END_NAMESPACE
+
+#include "moc_qmediaavailabilitycontrol.cpp"
diff --git a/src/multimedia/controls/qmediacontainercontrol.cpp b/src/multimedia/controls/qmediacontainercontrol.cpp
index 0f130645f..b15c8acdc 100644
--- a/src/multimedia/controls/qmediacontainercontrol.cpp
+++ b/src/multimedia/controls/qmediacontainercontrol.cpp
@@ -116,6 +116,6 @@ QMediaContainerControl::~QMediaContainerControl()
     Returns a description of the container \a formatMimeType.
 */
 
-#include "moc_qmediacontainercontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediacontainercontrol.cpp"
diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp
index 222bee216..9e9ad239d 100644
--- a/src/multimedia/controls/qmedianetworkaccesscontrol.cpp
+++ b/src/multimedia/controls/qmedianetworkaccesscontrol.cpp
@@ -96,7 +96,6 @@ QMediaNetworkAccessControl::~QMediaNetworkAccessControl()
     to \a configuration.
 */
 
-
+QT_END_NAMESPACE
 
 #include "moc_qmedianetworkaccesscontrol.cpp"
-QT_END_NAMESPACE
diff --git a/src/multimedia/controls/qmediaplayercontrol.cpp b/src/multimedia/controls/qmediaplayercontrol.cpp
index 15f9e7d49..28b217af8 100644
--- a/src/multimedia/controls/qmediaplayercontrol.cpp
+++ b/src/multimedia/controls/qmediaplayercontrol.cpp
@@ -380,6 +380,6 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent):
     Signal emitted when playback rate changes to \a rate.
 */
 
-#include "moc_qmediaplayercontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediaplayercontrol.cpp"
diff --git a/src/multimedia/controls/qmediaplaylistcontrol.cpp b/src/multimedia/controls/qmediaplaylistcontrol.cpp
index a9144e404..61e20e170 100644
--- a/src/multimedia/controls/qmediaplaylistcontrol.cpp
+++ b/src/multimedia/controls/qmediaplaylistcontrol.cpp
@@ -201,6 +201,6 @@ QMediaPlaylistControl::~QMediaPlaylistControl()
   Signal emitted when current media changes to \a content.
 */
 
-#include "moc_qmediaplaylistcontrol_p.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediaplaylistcontrol_p.cpp"
diff --git a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp
index 3c1ee4565..f95c4b508 100644
--- a/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp
+++ b/src/multimedia/controls/qmediaplaylistsourcecontrol.cpp
@@ -121,6 +121,6 @@ QMediaPlaylistSourceControl::~QMediaPlaylistSourceControl()
   Signal emitted when the playlist has changed to \a playlist.
 */
 
-#include "moc_qmediaplaylistsourcecontrol_p.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediaplaylistsourcecontrol_p.cpp"
diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp
index e4667d369..f078073ef 100644
--- a/src/multimedia/controls/qmediarecordercontrol.cpp
+++ b/src/multimedia/controls/qmediarecordercontrol.cpp
@@ -217,6 +217,6 @@ QMediaRecorderControl::~QMediaRecorderControl()
     Signals that an \a error has occurred.  The \a errorString describes the error.
 */
 
-#include "moc_qmediarecordercontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediarecordercontrol.cpp"
diff --git a/src/multimedia/controls/qmediastreamscontrol.cpp b/src/multimedia/controls/qmediastreamscontrol.cpp
index 2daf50de8..aa5fe007d 100644
--- a/src/multimedia/controls/qmediastreamscontrol.cpp
+++ b/src/multimedia/controls/qmediastreamscontrol.cpp
@@ -155,6 +155,6 @@ QMediaStreamsControl::~QMediaStreamsControl()
     The signal is emitted when the active streams list is changed.
 */
 
-#include "moc_qmediastreamscontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediastreamscontrol.cpp"
diff --git a/src/multimedia/controls/qmediavideoprobecontrol.cpp b/src/multimedia/controls/qmediavideoprobecontrol.cpp
index 57bfbc78b..ea27ab057 100644
--- a/src/multimedia/controls/qmediavideoprobecontrol.cpp
+++ b/src/multimedia/controls/qmediavideoprobecontrol.cpp
@@ -96,6 +96,6 @@ QMediaVideoProbeControl::~QMediaVideoProbeControl()
     This signal should be emitted when it is required to release all frames.
 */
 
-#include "moc_qmediavideoprobecontrol.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qmediavideoprobecontrol.cpp"
diff --git a/src/multimedia/controls/qmetadatareadercontrol.cpp b/src/multimedia/controls/qmetadatareadercontrol.cpp
index 8e9880c68..e728353f6 100644
--- a/src/multimedia/controls/qmetadatareadercontrol.cpp
+++ b/src/multimedia/controls/qmetadatareadercontrol.cpp
@@ -143,6 +143,6 @@ QMetaDataReaderControl::~QMetaDataReaderControl()
     be true if the multimedia object has meta-data.
 */
 
-#include "moc_qmetadatareadercontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmetadatareadercontrol.cpp"
diff --git a/src/multimedia/controls/qmetadatawritercontrol.cpp b/src/multimedia/controls/qmetadatawritercontrol.cpp
index e9d7dc793..053597b88 100644
--- a/src/multimedia/controls/qmetadatawritercontrol.cpp
+++ b/src/multimedia/controls/qmetadatawritercontrol.cpp
@@ -163,6 +163,6 @@ QMetaDataWriterControl::~QMetaDataWriterControl()
     true if meta-data elements can be added or adjusted.
 */
 
-#include "moc_qmetadatawritercontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmetadatawritercontrol.cpp"
diff --git a/src/multimedia/controls/qradiodatacontrol.cpp b/src/multimedia/controls/qradiodatacontrol.cpp
index eaa9aaed6..df0046b5e 100644
--- a/src/multimedia/controls/qradiodatacontrol.cpp
+++ b/src/multimedia/controls/qradiodatacontrol.cpp
@@ -187,6 +187,6 @@ QRadioDataControl::~QRadioDataControl()
     Signals that the Radio Text \a radioText has changed
 */
 
-#include "moc_qradiodatacontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qradiodatacontrol.cpp"
diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.cpp b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp
index ccdb3e798..8c4ee7ba4 100644
--- a/src/multimedia/controls/qvideodeviceselectorcontrol.cpp
+++ b/src/multimedia/controls/qvideodeviceselectorcontrol.cpp
@@ -137,6 +137,6 @@ QVideoDeviceSelectorControl::~QVideoDeviceSelectorControl()
     Signals that the selected video device \a name has changed.
 */
 
-#include "moc_qvideodeviceselectorcontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qvideodeviceselectorcontrol.cpp"
diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.cpp b/src/multimedia/controls/qvideoencodersettingscontrol.cpp
index c06bf7387..52ae51382 100644
--- a/src/multimedia/controls/qvideoencodersettingscontrol.cpp
+++ b/src/multimedia/controls/qvideoencodersettingscontrol.cpp
@@ -155,6 +155,6 @@ QVideoEncoderSettingsControl::~QVideoEncoderSettingsControl()
     Sets the selected video encoder \a settings.
 */
 
-#include "moc_qvideoencodersettingscontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qvideoencodersettingscontrol.cpp"
diff --git a/src/multimedia/controls/qvideorenderercontrol.cpp b/src/multimedia/controls/qvideorenderercontrol.cpp
index 92973e5f8..e722dfa38 100644
--- a/src/multimedia/controls/qvideorenderercontrol.cpp
+++ b/src/multimedia/controls/qvideorenderercontrol.cpp
@@ -103,6 +103,6 @@ QVideoRendererControl::~QVideoRendererControl()
     Sets the \a surface a video producer renders to.
 */
 
-#include "moc_qvideorenderercontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qvideorenderercontrol.cpp"
diff --git a/src/multimedia/controls/qvideowindowcontrol.cpp b/src/multimedia/controls/qvideowindowcontrol.cpp
index c41490694..e971a6925 100644
--- a/src/multimedia/controls/qvideowindowcontrol.cpp
+++ b/src/multimedia/controls/qvideowindowcontrol.cpp
@@ -253,6 +253,6 @@ QVideoWindowControl::~QVideoWindowControl()
     Signals that a video overlay's \a saturation adjustment has changed.
 */
 
-#include "moc_qvideowindowcontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qvideowindowcontrol.cpp"
diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
index 3f24d0f55..3156081e7 100644
--- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
+++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp
@@ -276,7 +276,6 @@ void QMediaNetworkPlaylistProvider::shuffle()
 
 }
 
-#include "moc_qmedianetworkplaylistprovider_p.cpp"
-
 QT_END_NAMESPACE
 
+#include "moc_qmedianetworkplaylistprovider_p.cpp"
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index c4d574d4e..bfc8bcdc3 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -1643,6 +1643,6 @@ QStringList QMediaPlayer::supportedCustomAudioRoles() const
             QAbstractVideoSurface \l {setVideoOutput()}{output}.
 */
 
-#include "moc_qmediaplayer.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediaplayer.cpp"
diff --git a/src/multimedia/playback/qmediaplaylist.cpp b/src/multimedia/playback/qmediaplaylist.cpp
index 7618827da..7c21a599b 100644
--- a/src/multimedia/playback/qmediaplaylist.cpp
+++ b/src/multimedia/playback/qmediaplaylist.cpp
@@ -818,7 +818,7 @@ void QMediaPlaylist::setCurrentIndex(int playlistPosition)
     \value AccessDeniedError       Access denied error.
 */
 
-#include "moc_qmediaplaylist.cpp"
-#include "moc_qmediaplaylist_p.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediaplaylist.cpp"
+#include "moc_qmediaplaylist_p.cpp"
diff --git a/src/multimedia/playback/qmediaplaylistioplugin.cpp b/src/multimedia/playback/qmediaplaylistioplugin.cpp
index a0f0e8321..957c7c79d 100644
--- a/src/multimedia/playback/qmediaplaylistioplugin.cpp
+++ b/src/multimedia/playback/qmediaplaylistioplugin.cpp
@@ -183,6 +183,6 @@ QMediaPlaylistIOPlugin::~QMediaPlaylistIOPlugin()
     If the device is invalid or the format is unsupported this will return a null pointer.
 */
 
-#include "moc_qmediaplaylistioplugin_p.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediaplaylistioplugin_p.cpp"
diff --git a/src/multimedia/playback/qmediaplaylistnavigator.cpp b/src/multimedia/playback/qmediaplaylistnavigator.cpp
index 120f621f5..9b25f968a 100644
--- a/src/multimedia/playback/qmediaplaylistnavigator.cpp
+++ b/src/multimedia/playback/qmediaplaylistnavigator.cpp
@@ -539,6 +539,6 @@ void QMediaPlaylistNavigatorPrivate::_q_mediaChanged(int start, int end)
     Signals that media immediately surrounding the current position has changed.
 */
 
-#include "moc_qmediaplaylistnavigator_p.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediaplaylistnavigator_p.cpp"
diff --git a/src/multimedia/playback/qmediaplaylistprovider.cpp b/src/multimedia/playback/qmediaplaylistprovider.cpp
index f441052c1..b146fb7b3 100644
--- a/src/multimedia/playback/qmediaplaylistprovider.cpp
+++ b/src/multimedia/playback/qmediaplaylistprovider.cpp
@@ -316,6 +316,6 @@ void QMediaPlaylistProvider::shuffle()
     Signals that a load failed() due to an \a error.  The \a errorMessage provides more information.
 */
 
-#include "moc_qmediaplaylistprovider_p.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediaplaylistprovider_p.cpp"
diff --git a/src/multimedia/qmediacontrol.cpp b/src/multimedia/qmediacontrol.cpp
index 939b9f393..b8f980aa0 100644
--- a/src/multimedia/qmediacontrol.cpp
+++ b/src/multimedia/qmediacontrol.cpp
@@ -130,6 +130,6 @@ QMediaControl::QMediaControl(QMediaControlPrivate &dd, QObject *parent)
     d_ptr->q_ptr = this;
 }
 
-#include "moc_qmediacontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediacontrol.cpp"
diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp
index a12cab404..ec2bebb34 100644
--- a/src/multimedia/qmediaobject.cpp
+++ b/src/multimedia/qmediaobject.cpp
@@ -430,7 +430,6 @@ void QMediaObject::setupControls()
     Signal emitted when the availability of the service has changed to \a availability.
 */
 
-
-#include "moc_qmediaobject.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediaobject.cpp"
diff --git a/src/multimedia/qmediaservice.cpp b/src/multimedia/qmediaservice.cpp
index 4d6b3c039..7580ecce7 100644
--- a/src/multimedia/qmediaservice.cpp
+++ b/src/multimedia/qmediaservice.cpp
@@ -142,7 +142,6 @@ QMediaService::~QMediaService()
     Releases a \a control back to the service.
 */
 
-#include "moc_qmediaservice.cpp"
-
 QT_END_NAMESPACE
 
+#include "moc_qmediaservice.cpp"
diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp
index 023c13008..af09c406f 100644
--- a/src/multimedia/qmediaserviceprovider.cpp
+++ b/src/multimedia/qmediaserviceprovider.cpp
@@ -979,7 +979,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider()
     Returns a set of features supported by a plug-in \a service.
 */
 
-#include "moc_qmediaserviceprovider_p.cpp"
-#include "moc_qmediaserviceproviderplugin.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediaserviceprovider_p.cpp"
+#include "moc_qmediaserviceproviderplugin.cpp"
diff --git a/src/multimedia/radio/qradiodata.cpp b/src/multimedia/radio/qradiodata.cpp
index d71488b52..4c824a4f8 100644
--- a/src/multimedia/radio/qradiodata.cpp
+++ b/src/multimedia/radio/qradiodata.cpp
@@ -473,6 +473,6 @@ QString QRadioData::errorString() const
     \value College
 */
 
-#include "moc_qradiodata.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qradiodata.cpp"
diff --git a/src/multimedia/radio/qradiotuner.cpp b/src/multimedia/radio/qradiotuner.cpp
index cc9abdbf8..2af0d0f02 100644
--- a/src/multimedia/radio/qradiotuner.cpp
+++ b/src/multimedia/radio/qradiotuner.cpp
@@ -654,6 +654,6 @@ QRadioData *QRadioTuner::radioData() const
   This signal is emitted when the state changes to \a state.
  */
 
-#include "moc_qradiotuner.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qradiotuner.cpp"
diff --git a/src/multimedia/recording/qaudiorecorder.cpp b/src/multimedia/recording/qaudiorecorder.cpp
index dcbdabc17..1db5c54a2 100644
--- a/src/multimedia/recording/qaudiorecorder.cpp
+++ b/src/multimedia/recording/qaudiorecorder.cpp
@@ -243,8 +243,6 @@ void QAudioRecorder::setAudioInput(const QString& name)
     Signal is emitted when the available audio inputs change.
 */
 
-
-
-#include "moc_qaudiorecorder.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qaudiorecorder.cpp"
diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp
index 2b7729481..1d562a00e 100644
--- a/src/multimedia/recording/qmediarecorder.cpp
+++ b/src/multimedia/recording/qmediarecorder.cpp
@@ -1105,6 +1105,6 @@ QStringList QMediaRecorder::availableMetaData() const
     Signal the changes of one meta-data element \a value with the given \a key.
 */
 
-#include "moc_qmediarecorder.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qmediarecorder.cpp"
diff --git a/src/multimediawidgets/qgraphicsvideoitem.cpp b/src/multimediawidgets/qgraphicsvideoitem.cpp
index 38f5c0e5b..2db8987fb 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.cpp
+++ b/src/multimediawidgets/qgraphicsvideoitem.cpp
@@ -415,5 +415,6 @@ void QGraphicsVideoItem::timerEvent(QTimerEvent *event)
     QGraphicsObject::timerEvent(event);
 }
 
-#include "moc_qgraphicsvideoitem.cpp"
 QT_END_NAMESPACE
+
+#include "moc_qgraphicsvideoitem.cpp"
diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp
index 6af0c7588..944ea23a7 100644
--- a/src/multimediawidgets/qpaintervideosurface.cpp
+++ b/src/multimediawidgets/qpaintervideosurface.cpp
@@ -1761,7 +1761,6 @@ void QPainterVideoSurface::createPainter()
 #endif
 }
 
-#include "moc_qpaintervideosurface_p.cpp"
 QT_END_NAMESPACE
 
-
+#include "moc_qpaintervideosurface_p.cpp"
diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp
index 7d26a8534..bae0efd22 100644
--- a/src/multimediawidgets/qvideowidget.cpp
+++ b/src/multimediawidgets/qvideowidget.cpp
@@ -1023,7 +1023,7 @@ bool QVideoWidget::nativeEvent(const QByteArray &eventType, void *message, long
 }
 #endif
 
-#include "moc_qvideowidget.cpp"
-#include "moc_qvideowidget_p.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qvideowidget.cpp"
+#include "moc_qvideowidget_p.cpp"
diff --git a/src/multimediawidgets/qvideowidgetcontrol.cpp b/src/multimediawidgets/qvideowidgetcontrol.cpp
index a71500dbd..7f72c620e 100644
--- a/src/multimediawidgets/qvideowidgetcontrol.cpp
+++ b/src/multimediawidgets/qvideowidgetcontrol.cpp
@@ -219,6 +219,6 @@ QVideoWidgetControl::~QVideoWidgetControl()
     Returns the QWidget.
 */
 
-#include "moc_qvideowidgetcontrol.cpp"
 QT_END_NAMESPACE
 
+#include "moc_qvideowidgetcontrol.cpp"
-- 
cgit v1.2.3