diff options
Diffstat (limited to 'src/multimedia')
-rw-r--r-- | src/multimedia/qcamera.cpp | 8 | ||||
-rw-r--r-- | src/multimedia/qcameraexposure.cpp | 10 | ||||
-rw-r--r-- | src/multimedia/qcamerafocus.cpp | 8 | ||||
-rw-r--r-- | src/multimedia/qcameraimagecapture.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/qcameraimageprocessing.cpp | 8 | ||||
-rw-r--r-- | src/multimedia/qmediaimageviewer.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/qmediaimageviewerservice.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/qmediaplayer.cpp | 18 | ||||
-rw-r--r-- | src/multimedia/qmediaplaylistsourcecontrol.cpp | 4 | ||||
-rw-r--r-- | src/multimedia/qmediarecorder.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/qmetadatareadercontrol.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/qmetadatawritercontrol.cpp | 2 |
12 files changed, 34 insertions, 34 deletions
diff --git a/src/multimedia/qcamera.cpp b/src/multimedia/qcamera.cpp index 2b18726..fd1fe5b 100644 --- a/src/multimedia/qcamera.cpp +++ b/src/multimedia/qcamera.cpp @@ -39,11 +39,10 @@ ** ****************************************************************************/ -#include <QDebug> +#include "qvideosurfaceoutput_p.h" +#include "qmediaobject_p.h" #include <qcamera.h> - -#include <qmediaobject_p.h> #include <qcameracontrol.h> #include <qcameralockscontrol.h> #include <qcameraexposurecontrol.h> @@ -52,7 +51,8 @@ #include <qcameraimageprocessingcontrol.h> #include <qcameraimagecapturecontrol.h> #include <qvideodevicecontrol.h> -#include <qvideosurfaceoutput_p.h> + +#include <QDebug> QT_USE_NAMESPACE diff --git a/src/multimedia/qcameraexposure.cpp b/src/multimedia/qcameraexposure.cpp index 580b1ca..5c75ad9 100644 --- a/src/multimedia/qcameraexposure.cpp +++ b/src/multimedia/qcameraexposure.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#include <QDebug> +#include "qcameraexposure.h" +#include "qmediaobject_p.h" -#include <qcameraexposure.h> #include <qcamera.h> - -#include <qmediaobject_p.h> #include <qcameraexposurecontrol.h> #include <qcameraflashcontrol.h> -#include <qmetaobject.h> + +#include <QtCore/QMetaObject> +#include <QtCore/QDebug> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/qcamerafocus.cpp b/src/multimedia/qcamerafocus.cpp index 22a0bbc..9b9caed 100644 --- a/src/multimedia/qcamerafocus.cpp +++ b/src/multimedia/qcamerafocus.cpp @@ -39,12 +39,10 @@ ** ****************************************************************************/ -#include <QDebug> +#include "qcamerafocus.h" +#include "qmediaobject_p.h" #include <qcamera.h> -#include <qcamerafocus.h> - -#include <qmediaobject_p.h> #include <qcameracontrol.h> #include <qcameraexposurecontrol.h> #include <qcamerafocuscontrol.h> @@ -52,6 +50,8 @@ #include <qcameraimagecapturecontrol.h> #include <qvideodevicecontrol.h> +#include <QtCore/QDebug> + QT_BEGIN_NAMESPACE namespace diff --git a/src/multimedia/qcameraimagecapture.cpp b/src/multimedia/qcameraimagecapture.cpp index 6b399b6..f49531e 100644 --- a/src/multimedia/qcameraimagecapture.cpp +++ b/src/multimedia/qcameraimagecapture.cpp @@ -45,7 +45,7 @@ #include <qcameracapturebufferformatcontrol.h> #include <qimageencodercontrol.h> -#include <qmediaobject_p.h> +#include "qmediaobject_p.h" #include <qmediaservice.h> #include <qcamera.h> #include <qcameracontrol.h> diff --git a/src/multimedia/qcameraimageprocessing.cpp b/src/multimedia/qcameraimageprocessing.cpp index 600dfd8..4286afc 100644 --- a/src/multimedia/qcameraimageprocessing.cpp +++ b/src/multimedia/qcameraimageprocessing.cpp @@ -39,11 +39,9 @@ ** ****************************************************************************/ -#include <QDebug> +#include "qcameraimageprocessing.h" +#include "qmediaobject_p.h" -#include <qcameraimageprocessing.h> - -#include <qmediaobject_p.h> #include <qcameracontrol.h> #include <qcameraexposurecontrol.h> #include <qcamerafocuscontrol.h> @@ -52,6 +50,8 @@ #include <qcameraimagecapturecontrol.h> #include <qvideodevicecontrol.h> +#include <QtCore/QDebug> + QT_BEGIN_NAMESPACE /*! diff --git a/src/multimedia/qmediaimageviewer.cpp b/src/multimedia/qmediaimageviewer.cpp index 01265dc..9a9a656 100644 --- a/src/multimedia/qmediaimageviewer.cpp +++ b/src/multimedia/qmediaimageviewer.cpp @@ -48,7 +48,7 @@ #include <qmediaplaylistsourcecontrol.h> #include <qmediacontent.h> #include <qmediaresource.h> -#include <qvideosurfaceoutput_p.h> +#include "qvideosurfaceoutput_p.h" #include <QtCore/qcoreevent.h> #include <QtCore/qdatetime.h> diff --git a/src/multimedia/qmediaimageviewerservice.cpp b/src/multimedia/qmediaimageviewerservice.cpp index 65de7a8..94c6d2e 100644 --- a/src/multimedia/qmediaimageviewerservice.cpp +++ b/src/multimedia/qmediaimageviewerservice.cpp @@ -46,7 +46,7 @@ #include <qmediacontent.h> #include <qmediaresource.h> -#include <qmediaobject_p.h> +#include "qmediaobject_p.h" #include <qvideorenderercontrol.h> #include <QtCore/qdebug.h> diff --git a/src/multimedia/qmediaplayer.cpp b/src/multimedia/qmediaplayer.cpp index 5d5a7a7..312122d 100644 --- a/src/multimedia/qmediaplayer.cpp +++ b/src/multimedia/qmediaplayer.cpp @@ -39,25 +39,25 @@ ** ****************************************************************************/ -#include <QtCore/qcoreevent.h> -#include <QtCore/qmetaobject.h> -#include <QtCore/qtimer.h> -#include <QtCore/qdebug.h> -#include <QtCore/qpointer.h> - - #include "qmediaplayer.h" +#include "qvideosurfaceoutput_p.h" -#include <qmediaobject_p.h> +#include "qmediaobject_p.h" #include <qmediaservice.h> #include <qmediaplayercontrol.h> #include <qmediaserviceprovider.h> #include <qmediaplaylist.h> #include <qmediaplaylistcontrol.h> #include <qmediaplaylistsourcecontrol.h> -#include <qvideosurfaceoutput_p.h> + #include <qmedianetworkaccesscontrol.h> +#include <QtCore/qcoreevent.h> +#include <QtCore/qmetaobject.h> +#include <QtCore/qtimer.h> +#include <QtCore/qdebug.h> +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE /*! diff --git a/src/multimedia/qmediaplaylistsourcecontrol.cpp b/src/multimedia/qmediaplaylistsourcecontrol.cpp index ca90fed..2ab8aee 100644 --- a/src/multimedia/qmediaplaylistsourcecontrol.cpp +++ b/src/multimedia/qmediaplaylistsourcecontrol.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ -#include <qmediaplaylistsourcecontrol.h> -#include <qmediacontrol_p.h> +#include "qmediaplaylistsourcecontrol.h" +#include "qmediacontrol_p.h" QT_BEGIN_NAMESPACE diff --git a/src/multimedia/qmediarecorder.cpp b/src/multimedia/qmediarecorder.cpp index bcbae57..6be462d 100644 --- a/src/multimedia/qmediarecorder.cpp +++ b/src/multimedia/qmediarecorder.cpp @@ -42,7 +42,7 @@ #include "qmediarecorder.h" #include <qmediarecordercontrol.h> -#include <qmediaobject_p.h> +#include "qmediaobject_p.h" #include <qmediaservice.h> #include <qmediaserviceprovider.h> #include <qmetadatawritercontrol.h> diff --git a/src/multimedia/qmetadatareadercontrol.cpp b/src/multimedia/qmetadatareadercontrol.cpp index a15cf6d..63dd375 100644 --- a/src/multimedia/qmetadatareadercontrol.cpp +++ b/src/multimedia/qmetadatareadercontrol.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <qmediacontrol_p.h> +#include "qmediacontrol_p.h" #include <qmetadatareadercontrol.h> QT_BEGIN_NAMESPACE diff --git a/src/multimedia/qmetadatawritercontrol.cpp b/src/multimedia/qmetadatawritercontrol.cpp index 0888bcf..9d01662 100644 --- a/src/multimedia/qmetadatawritercontrol.cpp +++ b/src/multimedia/qmetadatawritercontrol.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <qmediacontrol_p.h> +#include "qmediacontrol_p.h" #include <qmetadatawritercontrol.h> QT_BEGIN_NAMESPACE |