slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix syncqt-warnings.

Browse Source 
Use include with module name for the multimedia-classes.

Change-Id: I8da1a4015a162959b604cd859aee139e246e3f6c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
This commit is contained in:
Friedemann Kleint
2012-11-19 17:40:31 +01:00
committed by The Qt Project
parent d64e246f33
commit cc24af773b
78 changed files with 201 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/multimedia/audio/qaudio.h
View File

@@ -43,8 +43,8 @@
#ifndef QAUDIO_H #ifndef QAUDIO_H
#define QAUDIO_H #define QAUDIO_H
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include <qmultimedia.h> #include <QtMultimedia/qmultimedia.h>
#include <QtCore/qmetatype.h> #include <QtCore/qmetatype.h>

10
src/multimedia/audio/qaudiobuffer.h
View File

@@ -42,13 +42,13 @@
#ifndef QAUDIOBUFFER_H #ifndef QAUDIOBUFFER_H
#define QAUDIOBUFFER_H #define QAUDIOBUFFER_H
#include <QSharedDataPointer> #include <QtCore/qshareddata.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include <qmultimedia.h> #include <QtMultimedia/qmultimedia.h>
#include <qaudio.h> #include <QtMultimedia/qaudio.h>
#include <qaudioformat.h> #include <QtMultimedia/qaudioformat.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

6
src/multimedia/audio/qaudiodecoder.h
View File

@@ -42,10 +42,10 @@
#ifndef QAUDIODECODER_H #ifndef QAUDIODECODER_H
#define QAUDIODECODER_H #define QAUDIODECODER_H
#include "qmediaobject.h" #include <QtMultimedia/qmediaobject.h>
#include "qmediaenumdebug.h" #include <QtMultimedia/qmediaenumdebug.h>
#include "qaudiobuffer.h" #include <QtMultimedia/qaudiobuffer.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

8
src/multimedia/audio/qaudiodeviceinfo.h
View File

@@ -49,11 +49,11 @@
#include <QtCore/qstringlist.h> #include <QtCore/qstringlist.h>
#include <QtCore/qlist.h> #include <QtCore/qlist.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include <qmultimedia.h> #include <QtMultimedia/qmultimedia.h>
#include <qaudio.h> #include <QtMultimedia/qaudio.h>
#include <qaudioformat.h> #include <QtMultimedia/qaudioformat.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/audio/qaudioformat.h
View File

@@ -46,8 +46,8 @@
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include <QtCore/qshareddata.h> #include <QtCore/qshareddata.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include <qmultimedia.h> #include <QtMultimedia/qmultimedia.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

10
src/multimedia/audio/qaudioinput.h
View File

@@ -45,12 +45,12 @@
#include <QtCore/qiodevice.h> #include <QtCore/qiodevice.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include <qmultimedia.h> #include <QtMultimedia/qmultimedia.h>
#include <qaudio.h> #include <QtMultimedia/qaudio.h>
#include <qaudioformat.h> #include <QtMultimedia/qaudioformat.h>
#include <qaudiodeviceinfo.h> #include <QtMultimedia/qaudiodeviceinfo.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

10
src/multimedia/audio/qaudiooutput.h
View File

@@ -45,12 +45,12 @@
#include <QtCore/qiodevice.h> #include <QtCore/qiodevice.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include <qmultimedia.h> #include <QtMultimedia/qmultimedia.h>
#include <qaudio.h> #include <QtMultimedia/qaudio.h>
#include <qaudioformat.h> #include <QtMultimedia/qaudioformat.h>
#include <qaudiodeviceinfo.h> #include <QtMultimedia/qaudiodeviceinfo.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/audio/qaudioprobe.h
View File

@@ -42,8 +42,8 @@
#ifndef QAUDIOPROBE_H #ifndef QAUDIOPROBE_H
#define QAUDIOPROBE_H #define QAUDIOPROBE_H
#include <QObject> #include <QtCore/qobject.h>
#include <qaudiobuffer.h> #include <QtMultimedia/qaudiobuffer.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

10
src/multimedia/audio/qaudiosystem.h
View File

@@ -42,12 +42,12 @@
#ifndef QAUDIOSYSTEM_H #ifndef QAUDIOSYSTEM_H
#define QAUDIOSYSTEM_H #define QAUDIOSYSTEM_H
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include <qmultimedia.h> #include <QtMultimedia/qmultimedia.h>
#include "qaudio.h" #include <QtMultimedia/qaudio.h>
#include "qaudioformat.h" #include <QtMultimedia/qaudioformat.h>
#include "qaudiodeviceinfo.h" #include <QtMultimedia/qaudiodeviceinfo.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

10
src/multimedia/audio/qaudiosystemplugin.h
View File

@@ -46,12 +46,12 @@
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
#include <QtCore/qplugin.h> #include <QtCore/qplugin.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include <qmultimedia.h> #include <QtMultimedia/qmultimedia.h>
#include "qaudioformat.h" #include <QtMultimedia/qaudioformat.h>
#include "qaudiodeviceinfo.h" #include <QtMultimedia/qaudiodeviceinfo.h>
#include "qaudiosystem.h" #include <QtMultimedia/qaudiosystem.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/multimedia/audio/qsound.h
View File

@@ -42,7 +42,7 @@
#ifndef QSOUND_H #ifndef QSOUND_H
#define QSOUND_H #define QSOUND_H
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/multimedia/audio/qsoundeffect.h
View File

@@ -42,7 +42,7 @@
#ifndef QSOUNDEFFECT_H #ifndef QSOUNDEFFECT_H
#define QSOUNDEFFECT_H #define QSOUNDEFFECT_H
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include <QtCore/qurl.h> #include <QtCore/qurl.h>
#include <QtCore/qstringlist.h> #include <QtCore/qstringlist.h>

14
src/multimedia/camera/qcamera.h
View File

@@ -48,15 +48,15 @@
#include <QtCore/qpoint.h> #include <QtCore/qpoint.h>
#include <QtCore/qrect.h> #include <QtCore/qrect.h>
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qmediaservice.h> #include <QtMultimedia/qmediaservice.h>
#include <qcameraexposure.h> #include <QtMultimedia/qcameraexposure.h>
#include <qcamerafocus.h> #include <QtMultimedia/qcamerafocus.h>
#include <qcameraimageprocessing.h> #include <QtMultimedia/qcameraimageprocessing.h>
#include <qmediaenumdebug.h> #include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/camera/qcameraexposure.h
View File

@@ -42,8 +42,8 @@
#ifndef QCAMERAEXPOSURE_H #ifndef QCAMERAEXPOSURE_H
#define QCAMERAEXPOSURE_H #define QCAMERAEXPOSURE_H
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qmediaenumdebug.h> #include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/camera/qcamerafocus.h
View File

@@ -49,8 +49,8 @@
#include <QtCore/qrect.h> #include <QtCore/qrect.h>
#include <QtCore/qshareddata.h> #include <QtCore/qshareddata.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qmediaenumdebug.h> #include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

10
src/multimedia/camera/qcameraimagecapture.h
View File

@@ -42,12 +42,12 @@
#ifndef QCAMERAIMAGECAPTURE_H #ifndef QCAMERAIMAGECAPTURE_H
#define QCAMERAIMAGECAPTURE_H #define QCAMERAIMAGECAPTURE_H
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qmediaencodersettings.h> #include <QtMultimedia/qmediaencodersettings.h>
#include <qmediabindableinterface.h> #include <QtMultimedia/qmediabindableinterface.h>
#include <qvideoframe.h> #include <QtMultimedia/qvideoframe.h>
#include <qmediaenumdebug.h> #include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

8
src/multimedia/camera/qcameraimageprocessing.h
View File

@@ -48,10 +48,10 @@
#include <QtCore/qpoint.h> #include <QtCore/qpoint.h>
#include <QtCore/qrect.h> #include <QtCore/qrect.h>
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qmediaservice.h> #include <QtMultimedia/qmediaservice.h>
#include <qmediaenumdebug.h> #include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

6
src/multimedia/controls/qaudiodecodercontrol.h
View File

@@ -42,12 +42,12 @@
#ifndef QAUDIODECODERCONTROL_H #ifndef QAUDIODECODERCONTROL_H
#define QAUDIODECODERCONTROL_H #define QAUDIODECODERCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
#include "qaudiodecoder.h" #include <QtMultimedia/qaudiodecoder.h>
#include <QtCore/qpair.h> #include <QtCore/qpair.h>
#include "qaudiobuffer.h" #include <QtMultimedia/qaudiobuffer.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/controls/qaudioencodersettingscontrol.h
View File

@@ -42,8 +42,8 @@
#ifndef QAUDIOENCODERSETTINGSCONTROL_H #ifndef QAUDIOENCODERSETTINGSCONTROL_H
#define QAUDIOENCODERSETTINGSCONTROL_H #define QAUDIOENCODERSETTINGSCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
#include "qmediarecorder.h" #include <QtMultimedia/qmediarecorder.h>
#include <QtCore/qlist.h> #include <QtCore/qlist.h>
#include <QtCore/qpair.h> #include <QtCore/qpair.h>

4
src/multimedia/controls/qaudioinputselectorcontrol.h
View File

@@ -42,8 +42,8 @@
#ifndef QAUDIOINPUTSELECTORCONTROL_H #ifndef QAUDIOINPUTSELECTORCONTROL_H
#define QAUDIOINPUTSELECTORCONTROL_H #define QAUDIOINPUTSELECTORCONTROL_H
#include <qaudio.h> #include <QtMultimedia/qaudio.h>
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/controls/qaudiooutputselectorcontrol.h
View File

@@ -42,8 +42,8 @@
#ifndef QAUDIOOUTPUTSELECTORCONTROL_H #ifndef QAUDIOOUTPUTSELECTORCONTROL_H
#define QAUDIOOUTPUTSELECTORCONTROL_H #define QAUDIOOUTPUTSELECTORCONTROL_H
#include <qaudio.h> #include <QtMultimedia/qaudio.h>
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/controls/qcameracapturebufferformatcontrol.h
View File

@@ -42,8 +42,8 @@
#ifndef QCAMERACAPTUREBUFFERFORMATCONTROL_H #ifndef QCAMERACAPTUREBUFFERFORMATCONTROL_H
#define QCAMERACAPTUREBUFFERFORMATCONTROL_H #define QCAMERACAPTUREBUFFERFORMATCONTROL_H
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qcameraimagecapture.h> #include <QtMultimedia/qcameraimagecapture.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/controls/qcameracapturedestinationcontrol.h
View File

@@ -42,8 +42,8 @@
#ifndef QCAMERACAPTUREDESTINATIONCONTROL_H #ifndef QCAMERACAPTUREDESTINATIONCONTROL_H
#define QCAMERACAPTUREDESTINATIONCONTROL_H #define QCAMERACAPTUREDESTINATIONCONTROL_H
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qcameraimagecapture.h> #include <QtMultimedia/qcameraimagecapture.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

6
src/multimedia/controls/qcameracontrol.h
View File

@@ -42,10 +42,10 @@
#ifndef QCAMERACONTROL_H #ifndef QCAMERACONTROL_H
#define QCAMERACONTROL_H #define QCAMERACONTROL_H
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qcamera.h> #include <QtMultimedia/qcamera.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

10
src/multimedia/controls/qcameraexposurecontrol.h
View File

@@ -42,12 +42,12 @@
#ifndef QCAMERAEXPOSURECONTROL_H #ifndef QCAMERAEXPOSURECONTROL_H
#define QCAMERAEXPOSURECONTROL_H #define QCAMERAEXPOSURECONTROL_H
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qcameraexposure.h> #include <QtMultimedia/qcameraexposure.h>
#include <qcamera.h> #include <QtMultimedia/qcamera.h>
#include <qmediaenumdebug.h> #include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

8
src/multimedia/controls/qcamerafeedbackcontrol.h
View File

@@ -44,11 +44,11 @@
#ifndef QCAMERAFEEDBACKCONTROL_H #ifndef QCAMERAFEEDBACKCONTROL_H
#define QCAMERAFEEDBACKCONTROL_H #define QCAMERAFEEDBACKCONTROL_H
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qcamera.h> #include <QtMultimedia/qcamera.h>
#include <qmediaenumdebug.h> #include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

8
src/multimedia/controls/qcameraflashcontrol.h
View File

@@ -42,11 +42,11 @@
#ifndef QCAMERAFLASHCONTROL_H #ifndef QCAMERAFLASHCONTROL_H
#define QCAMERAFLASHCONTROL_H #define QCAMERAFLASHCONTROL_H
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qcameraexposure.h> #include <QtMultimedia/qcameraexposure.h>
#include <qcamera.h> #include <QtMultimedia/qcamera.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

6
src/multimedia/controls/qcamerafocuscontrol.h
View File

@@ -42,10 +42,10 @@
#ifndef QCAMERAFOCUSCONTROL_H #ifndef QCAMERAFOCUSCONTROL_H
#define QCAMERAFOCUSCONTROL_H #define QCAMERAFOCUSCONTROL_H
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qcamerafocus.h> #include <QtMultimedia/qcamerafocus.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/controls/qcameraimagecapturecontrol.h
View File

@@ -42,8 +42,8 @@
#ifndef QCAMERAIMAGECAPTURECONTROL_H #ifndef QCAMERAIMAGECAPTURECONTROL_H
#define QCAMERAIMAGECAPTURECONTROL_H #define QCAMERAIMAGECAPTURECONTROL_H
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qcameraimagecapture.h> #include <QtMultimedia/qcameraimagecapture.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

8
src/multimedia/controls/qcameraimageprocessingcontrol.h
View File

@@ -42,11 +42,11 @@
#ifndef QCAMERAIMAGEPROCESSINGCONTROL_H #ifndef QCAMERAIMAGEPROCESSINGCONTROL_H
#define QCAMERAIMAGEPROCESSINGCONTROL_H #define QCAMERAIMAGEPROCESSINGCONTROL_H
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qcamera.h> #include <QtMultimedia/qcamera.h>
#include <qmediaenumdebug.h> #include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

6
src/multimedia/controls/qcameralockscontrol.h
View File

@@ -42,10 +42,10 @@
#ifndef QCAMERALOCKSCONTROL_H #ifndef QCAMERALOCKSCONTROL_H
#define QCAMERALOCKSCONTROL_H #define QCAMERALOCKSCONTROL_H
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qcamera.h> #include <QtMultimedia/qcamera.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/multimedia/controls/qcameraviewfindersettingscontrol.h
View File

@@ -44,7 +44,7 @@
#ifndef QCAMERAVIEWFINDERSETTINGSCONTROL_H #ifndef QCAMERAVIEWFINDERSETTINGSCONTROL_H
#define QCAMERAVIEWFINDERSETTINGSCONTROL_H #define QCAMERAVIEWFINDERSETTINGSCONTROL_H
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/controls/qcamerazoomcontrol.h
View File

@@ -42,8 +42,8 @@
#ifndef QCAMERAZOOMCONTROL_H #ifndef QCAMERAZOOMCONTROL_H
#define QCAMERAZOOMCONTROL_H #define QCAMERAZOOMCONTROL_H
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

6
src/multimedia/controls/qimageencodercontrol.h
View File

@@ -42,9 +42,9 @@
#ifndef QIMAGEENCODERCONTROL_H #ifndef QIMAGEENCODERCONTROL_H
#define QIMAGEENCODERCONTROL_H #define QIMAGEENCODERCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
#include "qmediarecorder.h" #include <QtMultimedia/qmediarecorder.h>
#include "qmediaencodersettings.h" #include <QtMultimedia/qmediaencodersettings.h>
#include <QtCore/qsize.h> #include <QtCore/qsize.h>

2
src/multimedia/controls/qmediaaudioprobecontrol.h
View File

@@ -42,7 +42,7 @@
#ifndef QMEDIAAUDIOPROBECONTROL_H #ifndef QMEDIAAUDIOPROBECONTROL_H
#define QMEDIAAUDIOPROBECONTROL_H #define QMEDIAAUDIOPROBECONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

6
src/multimedia/controls/qmediaavailabilitycontrol.h
View File

@@ -42,9 +42,9 @@
#ifndef QMEDIAAVAILABILITYCONTROL_H #ifndef QMEDIAAVAILABILITYCONTROL_H
#define QMEDIAAVAILABILITYCONTROL_H #define QMEDIAAVAILABILITYCONTROL_H
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qmultimedia.h> #include <QtMultimedia/qmultimedia.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/multimedia/controls/qmediacontainercontrol.h
View File

@@ -43,7 +43,7 @@
#ifndef QMEDIACONTAINERCONTROL_H #ifndef QMEDIACONTAINERCONTROL_H
#define QMEDIACONTAINERCONTROL_H #define QMEDIACONTAINERCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/controls/qmediagaplessplaybackcontrol.h
View File

@@ -41,8 +41,8 @@
#ifndef QMEDIAGAPLESSPLAYBACKCONTROL_H #ifndef QMEDIAGAPLESSPLAYBACKCONTROL_H
#define QMEDIAGAPLESSPLAYBACKCONTROL_H #define QMEDIAGAPLESSPLAYBACKCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
#include "qmediacontent.h" #include <QtMultimedia/qmediacontent.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/multimedia/controls/qmedianetworkaccesscontrol.h
View File

@@ -43,7 +43,7 @@
#ifndef QMEDIANETWORKACCESSCONTROL_H #ifndef QMEDIANETWORKACCESSCONTROL_H
#define QMEDIANETWORKACCESSCONTROL_H #define QMEDIANETWORKACCESSCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
#include <QtCore/qlist.h> #include <QtCore/qlist.h>
#include <QtNetwork/qnetworkconfiguration.h> #include <QtNetwork/qnetworkconfiguration.h>

6
src/multimedia/controls/qmediaplayercontrol.h
View File

@@ -42,9 +42,9 @@
#ifndef QMEDIAPLAYERCONTROL_H #ifndef QMEDIAPLAYERCONTROL_H
#define QMEDIAPLAYERCONTROL_H #define QMEDIAPLAYERCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
#include "qmediaplayer.h" #include <QtMultimedia/qmediaplayer.h>
#include "qmediatimerange.h" #include <QtMultimedia/qmediatimerange.h>
#include <QtCore/qpair.h> #include <QtCore/qpair.h>

4
src/multimedia/controls/qmediarecordercontrol.h
View File

@@ -42,8 +42,8 @@
#ifndef QMEDIARECORDERCONTROL_H #ifndef QMEDIARECORDERCONTROL_H
#define QMEDIARECORDERCONTROL_H #define QMEDIARECORDERCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
#include "qmediarecorder.h" #include <QtMultimedia/qmediarecorder.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

8
src/multimedia/controls/qmediastreamscontrol.h
View File

@@ -43,10 +43,10 @@
#ifndef QMEDIASTREAMSCONTROL_H #ifndef QMEDIASTREAMSCONTROL_H
#define QMEDIASTREAMSCONTROL_H #define QMEDIASTREAMSCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
#include "qmultimedia.h" #include <QtMultimedia/qmultimedia.h>
#include "qtmultimediadefs.h" #include <QtMultimedia/qtmultimediadefs.h>
#include <qmediaenumdebug.h> #include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/multimedia/controls/qmediavideoprobecontrol.h
View File

@@ -44,7 +44,7 @@
#ifndef QMEDIAVIDEOPROBECONTROL_H #ifndef QMEDIAVIDEOPROBECONTROL_H
#define QMEDIAVIDEOPROBECONTROL_H #define QMEDIAVIDEOPROBECONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

10
src/multimedia/controls/qmetadatareadercontrol.h
View File

@@ -42,13 +42,13 @@
#ifndef QMETADATAREADERCONTROL_H #ifndef QMETADATAREADERCONTROL_H
#define QMETADATAREADERCONTROL_H #define QMETADATAREADERCONTROL_H
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qmediaresource.h> #include <QtMultimedia/qmediaresource.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include "qmultimedia.h" #include <QtMultimedia/qmultimedia.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

10
src/multimedia/controls/qmetadatawritercontrol.h
View File

@@ -42,13 +42,13 @@
#ifndef QMETADATAWRITERCONTROL_H #ifndef QMETADATAWRITERCONTROL_H
#define QMETADATAWRITERCONTROL_H #define QMETADATAWRITERCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
#include "qmediaobject.h" #include <QtMultimedia/qmediaobject.h>
#include "qmediaresource.h" #include <QtMultimedia/qmediaresource.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include "qmultimedia.h" #include <QtMultimedia/qmultimedia.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/controls/qradiodatacontrol.h
View File

@@ -42,8 +42,8 @@
#ifndef QRADIODATACONTROL_H #ifndef QRADIODATACONTROL_H
#define QRADIODATACONTROL_H #define QRADIODATACONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
#include "qradiodata.h" #include <QtMultimedia/qradiodata.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/controls/qradiotunercontrol.h
View File

@@ -42,8 +42,8 @@
#ifndef QRADIOTUNERCONTROL_H #ifndef QRADIOTUNERCONTROL_H
#define QRADIOTUNERCONTROL_H #define QRADIOTUNERCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
#include "qradiotuner.h" #include <QtMultimedia/qradiotuner.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/multimedia/controls/qvideodeviceselectorcontrol.h
View File

@@ -42,7 +42,7 @@
#ifndef QVIDEODEVICESELECTORCONTROL_H #ifndef QVIDEODEVICESELECTORCONTROL_H
#define QVIDEODEVICESELECTORCONTROL_H #define QVIDEODEVICESELECTORCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/controls/qvideoencodersettingscontrol.h
View File

@@ -42,8 +42,8 @@
#ifndef QVIDEOENCODERSETTINGSCONTROL_H #ifndef QVIDEOENCODERSETTINGSCONTROL_H
#define QVIDEOENCODERSETTINGSCONTROL_H #define QVIDEOENCODERSETTINGSCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
#include "qmediarecorder.h" #include <QtMultimedia/qmediarecorder.h>
#include <QtCore/qpair.h> #include <QtCore/qpair.h>
#include <QtCore/qsize.h> #include <QtCore/qsize.h>

2
src/multimedia/controls/qvideorenderercontrol.h
View File

@@ -42,7 +42,7 @@
#ifndef QVIDEORENDERERCONTROL_H #ifndef QVIDEORENDERERCONTROL_H
#define QVIDEORENDERERCONTROL_H #define QVIDEORENDERERCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/multimedia/controls/qvideowindowcontrol.h
View File

@@ -42,7 +42,7 @@
#ifndef QVIDEOWINDOWCONTROL_H #ifndef QVIDEOWINDOWCONTROL_H
#define QVIDEOWINDOWCONTROL_H #define QVIDEOWINDOWCONTROL_H
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
#include <QtCore/qrect.h> #include <QtCore/qrect.h>
#include <QtCore/qsize.h> #include <QtCore/qsize.h>
#include <QtGui/qwindowdefs.h> #include <QtGui/qwindowdefs.h>

4
src/multimedia/playback/qmediacontent.h
View File

@@ -45,9 +45,9 @@
#include <QtCore/qmetatype.h> #include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h> #include <QtCore/qshareddata.h>
#include "qmediaresource.h" #include <QtMultimedia/qmediaresource.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

6
src/multimedia/playback/qmediaplayer.h
View File

@@ -42,9 +42,9 @@
#ifndef QMEDIAPLAYER_H #ifndef QMEDIAPLAYER_H
#define QMEDIAPLAYER_H #define QMEDIAPLAYER_H
#include "qmediaobject.h" #include <QtMultimedia/qmediaobject.h>
#include "qmediacontent.h" #include <QtMultimedia/qmediacontent.h>
#include "qmediaenumdebug.h" #include <QtMultimedia/qmediaenumdebug.h>
#include <QtNetwork/qnetworkconfiguration.h> #include <QtNetwork/qnetworkconfiguration.h>

8
src/multimedia/playback/qmediaplaylist.h
View File

@@ -44,10 +44,10 @@
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include <qmediacontent.h> #include <QtMultimedia/qmediacontent.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qmediabindableinterface.h> #include <QtMultimedia/qmediabindableinterface.h>
#include <qmediaenumdebug.h> #include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/multimedia/playback/qmediaresource.h
View File

@@ -46,7 +46,7 @@
#include <QtCore/qmetatype.h> #include <QtCore/qmetatype.h>
#include <QtNetwork/qnetworkrequest.h> #include <QtNetwork/qnetworkrequest.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/multimedia/qmediabindableinterface.h
View File

@@ -42,7 +42,7 @@
#ifndef QMEDIABINDABLEINTERFACE_H #ifndef QMEDIABINDABLEINTERFACE_H
#define QMEDIABINDABLEINTERFACE_H #define QMEDIABINDABLEINTERFACE_H
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/multimedia/qmediacontrol.h
View File

@@ -42,7 +42,7 @@
#ifndef QABSTRACTMEDIACONTROL_H #ifndef QABSTRACTMEDIACONTROL_H
#define QABSTRACTMEDIACONTROL_H #define QABSTRACTMEDIACONTROL_H
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include <QtCore/qstring.h> #include <QtCore/qstring.h>

2
src/multimedia/qmediametadata.h
View File

@@ -46,7 +46,7 @@
#include <QtCore/qmetatype.h> #include <QtCore/qmetatype.h>
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/qmediaobject.h
View File

@@ -45,8 +45,8 @@
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include <QtCore/qstringlist.h> #include <QtCore/qstringlist.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include "qmultimedia.h" #include <QtMultimedia/qmultimedia.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/qmediaservice.h
View File

@@ -42,11 +42,11 @@
#ifndef QABSTRACTMEDIASERVICE_H #ifndef QABSTRACTMEDIASERVICE_H
#define QABSTRACTMEDIASERVICE_H #define QABSTRACTMEDIASERVICE_H
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include <QtCore/qstringlist.h> #include <QtCore/qstringlist.h>
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/qmediaserviceproviderplugin.h
View File

@@ -44,8 +44,8 @@
#include <QtCore/qstringlist.h> #include <QtCore/qstringlist.h>
#include <QtCore/qplugin.h> #include <QtCore/qplugin.h>
#include <qmultimedia.h> #include <QtMultimedia/qmultimedia.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#ifdef Q_MOC_RUN #ifdef Q_MOC_RUN
# pragma Q_MOC_EXPAND_MACROS # pragma Q_MOC_EXPAND_MACROS

4
src/multimedia/qmediatimerange.h
View File

@@ -42,8 +42,8 @@
#ifndef QMEDIATIMERANGE_H #ifndef QMEDIATIMERANGE_H
#define QMEDIATIMERANGE_H #define QMEDIATIMERANGE_H
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include "qmultimedia.h" #include <QtMultimedia/qmultimedia.h>
#include <QtCore/qshareddata.h> #include <QtCore/qshareddata.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimedia/qmultimedia.h
View File

@@ -46,8 +46,8 @@
#include <QtCore/qmetatype.h> #include <QtCore/qmetatype.h>
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include <qmediametadata.h> #include <QtMultimedia/qmediametadata.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

6
src/multimedia/radio/qradiodata.h
View File

@@ -44,9 +44,9 @@
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qmediabindableinterface.h> #include <QtMultimedia/qmediabindableinterface.h>
#include <qmediaenumdebug.h> #include <QtMultimedia/qmediaenumdebug.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

6
src/multimedia/radio/qradiotuner.h
View File

@@ -44,10 +44,10 @@
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include "qmediaobject.h" #include <QtMultimedia/qmediaobject.h>
#include <qmediaenumdebug.h> #include <QtMultimedia/qmediaenumdebug.h>
#include <QPair> #include <QtCore/qpair.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

8
src/multimedia/recording/qaudiorecorder.h
View File

@@ -42,10 +42,10 @@
#ifndef QAUDIORECORDER_H #ifndef QAUDIORECORDER_H
#define QAUDIORECORDER_H #define QAUDIORECORDER_H
#include <qmediarecorder.h> #include <QtMultimedia/qmediarecorder.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qmediaencodersettings.h> #include <QtMultimedia/qmediaencodersettings.h>
#include <qmediaenumdebug.h> #include <QtMultimedia/qmediaenumdebug.h>
#include <QtCore/qpair.h> #include <QtCore/qpair.h>

4
src/multimedia/recording/qmediaencodersettings.h
View File

@@ -46,8 +46,8 @@
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
#include <QtCore/qsize.h> #include <QtCore/qsize.h>
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include "qmultimedia.h" #include <QtMultimedia/qmultimedia.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

10
src/multimedia/recording/qmediarecorder.h
View File

@@ -42,11 +42,11 @@
#ifndef QMEDIARECORDER_H #ifndef QMEDIARECORDER_H
#define QMEDIARECORDER_H #define QMEDIARECORDER_H
#include <qmultimedia.h> #include <QtMultimedia/qmultimedia.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qmediaencodersettings.h> #include <QtMultimedia/qmediaencodersettings.h>
#include <qmediabindableinterface.h> #include <QtMultimedia/qmediabindableinterface.h>
#include <qmediaenumdebug.h> #include <QtMultimedia/qmediaenumdebug.h>
#include <QtCore/qpair.h> #include <QtCore/qpair.h>

4
src/multimedia/video/qabstractvideobuffer.h
View File

@@ -42,8 +42,8 @@
#ifndef QABSTRACTVIDEOBUFFER_H #ifndef QABSTRACTVIDEOBUFFER_H
#define QABSTRACTVIDEOBUFFER_H #define QABSTRACTVIDEOBUFFER_H
#include <qtmultimediadefs.h> #include <QtMultimedia/qtmultimediadefs.h>
#include <qmultimedia.h> #include <QtMultimedia/qmultimedia.h>
#include <QtCore/qmetatype.h> #include <QtCore/qmetatype.h>

2
src/multimedia/video/qabstractvideosurface.h
View File

@@ -43,7 +43,7 @@
#define QABSTRACTVIDEOSURFACE_H #define QABSTRACTVIDEOSURFACE_H
#include <QtCore/qobject.h> #include <QtCore/qobject.h>
#include <qvideoframe.h> #include <QtMultimedia/qvideoframe.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/multimedia/video/qvideoframe.h
View File

@@ -45,7 +45,7 @@
#include <QtCore/qmetatype.h> #include <QtCore/qmetatype.h>
#include <QtCore/qshareddata.h> #include <QtCore/qshareddata.h>
#include <QtGui/qimage.h> #include <QtGui/qimage.h>
#include <qabstractvideobuffer.h> #include <QtMultimedia/qabstractvideobuffer.h>
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/multimedia/video/qvideoprobe.h
View File

@@ -43,7 +43,7 @@
#define QVIDEOPROBE_H #define QVIDEOPROBE_H
#include <QObject> #include <QObject>
#include <qvideoframe.h> #include <QtMultimedia/qvideoframe.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

2
src/multimedia/video/qvideosurfaceformat.h
View File

@@ -47,7 +47,7 @@
#include <QtCore/qshareddata.h> #include <QtCore/qshareddata.h>
#include <QtCore/qsize.h> #include <QtCore/qsize.h>
#include <QtGui/qimage.h> #include <QtGui/qimage.h>
#include <qvideoframe.h> #include <QtMultimedia/qvideoframe.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

8
src/multimediawidgets/qcameraviewfinder.h
View File

@@ -48,10 +48,10 @@
#include <QtCore/qpoint.h> #include <QtCore/qpoint.h>
#include <QtCore/qrect.h> #include <QtCore/qrect.h>
#include <qmediacontrol.h> #include <QtMultimedia/qmediacontrol.h>
#include <qmediaobject.h> #include <QtMultimedia/qmediaobject.h>
#include <qmediaservice.h> #include <QtMultimedia/qmediaservice.h>
#include <qvideowidget.h> #include <QtMultimediaWidgets/qvideowidget.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimediawidgets/qgraphicsvideoitem.h
View File

@@ -44,8 +44,8 @@
#include <QtWidgets/qgraphicsitem.h> #include <QtWidgets/qgraphicsitem.h>
#include <qvideowidget.h> #include <QtMultimediaWidgets/qvideowidget.h>
#include <qmediabindableinterface.h> #include <QtMultimedia/qmediabindableinterface.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimediawidgets/qvideowidget.h
View File

@@ -44,8 +44,8 @@
#include <QtWidgets/qwidget.h> #include <QtWidgets/qwidget.h>
#include <qtmultimediawidgetdefs.h> #include <QtMultimediaWidgets/qtmultimediawidgetdefs.h>
#include <qmediabindableinterface.h> #include <QtMultimedia/qmediabindableinterface.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER

4
src/multimediawidgets/qvideowidgetcontrol.h
View File

@@ -42,8 +42,8 @@
#ifndef QVIDEOWIDGETCONTROL_H #ifndef QVIDEOWIDGETCONTROL_H
#define QVIDEOWIDGETCONTROL_H #define QVIDEOWIDGETCONTROL_H
#include "qvideowidget.h" #include <QtMultimediaWidgets/qvideowidget.h>
#include "qmediacontrol.h" #include <QtMultimedia/qmediacontrol.h>
#include <QtWidgets/qwidget.h> #include <QtWidgets/qwidget.h>

2
tests/auto/unit/qmultimedia_common/mockcameracapturedestinationcontrol.h
View File

@@ -42,7 +42,7 @@
#ifndef MOCKCAMERACAPTUREDESTINATIONCONTROL_H #ifndef MOCKCAMERACAPTUREDESTINATIONCONTROL_H
#define MOCKCAMERACAPTUREDESTINATIONCONTROL_H #define MOCKCAMERACAPTUREDESTINATIONCONTROL_H
#include "qcameracapturedestinationcontrol.h" #include <QtMultimedia/qcameracapturedestinationcontrol.h>
class MockCaptureDestinationControl : public QCameraCaptureDestinationControl class MockCaptureDestinationControl : public QCameraCaptureDestinationControl
{ {