diff options
28 files changed, 32 insertions, 32 deletions
diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h index f03411665..2337da44f 100644 --- a/src/multimedia/audio/qaudio.h +++ b/src/multimedia/audio/qaudio.h @@ -44,7 +44,7 @@ #define QAUDIO_H #include <qtmultimediadefs.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> #include <QtCore/qmetatype.h> diff --git a/src/multimedia/audio/qaudiobuffer.h b/src/multimedia/audio/qaudiobuffer.h index 652dea73f..ce656243b 100644 --- a/src/multimedia/audio/qaudiobuffer.h +++ b/src/multimedia/audio/qaudiobuffer.h @@ -45,7 +45,7 @@ #include <QSharedDataPointer> #include <qtmultimediadefs.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> #include <qaudio.h> #include <qaudioformat.h> diff --git a/src/multimedia/audio/qaudiobuffer_p.h b/src/multimedia/audio/qaudiobuffer_p.h index dfdc98061..20265444a 100644 --- a/src/multimedia/audio/qaudiobuffer_p.h +++ b/src/multimedia/audio/qaudiobuffer_p.h @@ -43,7 +43,7 @@ #define QAUDIOBUFFER_P_H #include <qtmultimediadefs.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> #include "qaudioformat.h" diff --git a/src/multimedia/audio/qaudiodevicefactory_p.h b/src/multimedia/audio/qaudiodevicefactory_p.h index 75e14cd68..40b08aae9 100644 --- a/src/multimedia/audio/qaudiodevicefactory_p.h +++ b/src/multimedia/audio/qaudiodevicefactory_p.h @@ -57,7 +57,7 @@ #include <QtCore/qlist.h> #include <qtmultimediadefs.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> #include "qaudiodeviceinfo.h" diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/audio/qaudiodeviceinfo.h index d1bbcdeb3..545726fee 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.h +++ b/src/multimedia/audio/qaudiodeviceinfo.h @@ -50,7 +50,7 @@ #include <QtCore/qlist.h> #include <qtmultimediadefs.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> #include <qaudio.h> #include <qaudioformat.h> diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/audio/qaudioformat.h index 38076c784..8acc36bd4 100644 --- a/src/multimedia/audio/qaudioformat.h +++ b/src/multimedia/audio/qaudioformat.h @@ -47,7 +47,7 @@ #include <QtCore/qshareddata.h> #include <qtmultimediadefs.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> QT_BEGIN_HEADER diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h index 583eb1892..fbeea840f 100644 --- a/src/multimedia/audio/qaudioinput.h +++ b/src/multimedia/audio/qaudioinput.h @@ -46,7 +46,7 @@ #include <QtCore/qiodevice.h> #include <qtmultimediadefs.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> #include <qaudio.h> #include <qaudioformat.h> diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h index 98bf10628..ac1dac623 100644 --- a/src/multimedia/audio/qaudiooutput.h +++ b/src/multimedia/audio/qaudiooutput.h @@ -46,7 +46,7 @@ #include <QtCore/qiodevice.h> #include <qtmultimediadefs.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> #include <qaudio.h> #include <qaudioformat.h> diff --git a/src/multimedia/audio/qaudiosystem.h b/src/multimedia/audio/qaudiosystem.h index 0ad2f6b6a..b68b8f884 100644 --- a/src/multimedia/audio/qaudiosystem.h +++ b/src/multimedia/audio/qaudiosystem.h @@ -43,7 +43,7 @@ #define QAUDIOSYSTEM_H #include <qtmultimediadefs.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> #include "qaudio.h" #include "qaudioformat.h" diff --git a/src/multimedia/audio/qaudiosystemplugin.h b/src/multimedia/audio/qaudiosystemplugin.h index b07dacc09..743045100 100644 --- a/src/multimedia/audio/qaudiosystemplugin.h +++ b/src/multimedia/audio/qaudiosystemplugin.h @@ -47,7 +47,7 @@ #include <QtCore/qplugin.h> #include <qtmultimediadefs.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> #include "qaudioformat.h" #include "qaudiodeviceinfo.h" diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h index ee1b642f0..190e460d5 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.h +++ b/src/multimedia/controls/qmediaavailabilitycontrol.h @@ -44,7 +44,7 @@ #include <qmediacontrol.h> #include <qmediaobject.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> QT_BEGIN_HEADER diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h index a1b0f2855..de13f95c4 100644 --- a/src/multimedia/controls/qmediastreamscontrol.h +++ b/src/multimedia/controls/qmediastreamscontrol.h @@ -44,7 +44,7 @@ #define QMEDIASTREAMSCONTROL_H #include "qmediacontrol.h" -#include "qtmedianamespace.h" +#include "qmultimedia.h" #include "qtmultimediadefs.h" #include <qmediaenumdebug.h> diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h index 5d1972cd8..1d9b94a82 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.h +++ b/src/multimedia/controls/qmetadatareadercontrol.h @@ -48,7 +48,7 @@ #include <qmediaresource.h> #include <qtmultimediadefs.h> -#include "qtmedianamespace.h" +#include "qmultimedia.h" QT_BEGIN_HEADER diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h index 88de69e2b..ecbf329ef 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.h +++ b/src/multimedia/controls/qmetadatawritercontrol.h @@ -48,7 +48,7 @@ #include "qmediaresource.h" #include <qtmultimediadefs.h> -#include "qtmedianamespace.h" +#include "qmultimedia.h" QT_BEGIN_HEADER diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 7df18e527..e8ced991c 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -31,7 +31,7 @@ PUBLIC_HEADERS += \ qmediaservice.h \ qmediaserviceproviderplugin.h \ qmediatimerange.h \ - qtmedianamespace.h \ + qmultimedia.h \ qtmultimediadefs.h \ SOURCES += \ @@ -43,10 +43,10 @@ SOURCES += \ qmediaservice.cpp \ qmediaserviceprovider.cpp \ qmediatimerange.cpp \ - qtmedianamespace.cpp \ qmediaresourcepolicyplugin_p.cpp \ qmediaresourcepolicy_p.cpp \ - qmediaresourceset_p.cpp + qmediaresourceset_p.cpp \ + qmultimedia.cpp include(audio/audio.pri) include(camera/camera.pri) diff --git a/src/multimedia/playback/playlistfileparser.cpp b/src/multimedia/playback/playlistfileparser.cpp index 19870e477..64bff81ef 100644 --- a/src/multimedia/playback/playlistfileparser.cpp +++ b/src/multimedia/playback/playlistfileparser.cpp @@ -43,7 +43,7 @@ #include <qfileinfo.h> #include <QtNetwork/QNetworkReply> #include "qmediaobject_p.h" -#include "qtmedianamespace.h" +#include "qmultimedia.h" QT_BEGIN_NAMESPACE diff --git a/src/multimedia/qmediaobject.h b/src/multimedia/qmediaobject.h index 258b430ba..7a70bb4c8 100644 --- a/src/multimedia/qmediaobject.h +++ b/src/multimedia/qmediaobject.h @@ -46,7 +46,7 @@ #include <QtCore/qstringlist.h> #include <qtmultimediadefs.h> -#include "qtmedianamespace.h" +#include "qmultimedia.h" QT_BEGIN_HEADER diff --git a/src/multimedia/qmediaserviceprovider_p.h b/src/multimedia/qmediaserviceprovider_p.h index c0689efb2..f6dc203d7 100644 --- a/src/multimedia/qmediaserviceprovider_p.h +++ b/src/multimedia/qmediaserviceprovider_p.h @@ -45,7 +45,7 @@ #include <QtCore/qobject.h> #include <QtCore/qshareddata.h> #include <qtmultimediadefs.h> -#include "qtmedianamespace.h" +#include "qmultimedia.h" #include "qmediaserviceproviderplugin.h" QT_BEGIN_HEADER diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h index d45c85899..65dbae1d1 100644 --- a/src/multimedia/qmediaserviceproviderplugin.h +++ b/src/multimedia/qmediaserviceproviderplugin.h @@ -44,7 +44,7 @@ #include <QtCore/qstringlist.h> #include <QtCore/qplugin.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> #include <qtmultimediadefs.h> #ifdef Q_MOC_RUN diff --git a/src/multimedia/qmediatimerange.h b/src/multimedia/qmediatimerange.h index ae4bd137e..4f5ad1d09 100644 --- a/src/multimedia/qmediatimerange.h +++ b/src/multimedia/qmediatimerange.h @@ -43,7 +43,7 @@ #define QMEDIATIMERANGE_H #include <qtmultimediadefs.h> -#include "qtmedianamespace.h" +#include "qmultimedia.h" #include <QtCore/qshareddata.h> QT_BEGIN_HEADER diff --git a/src/multimedia/qtmedianamespace.cpp b/src/multimedia/qmultimedia.cpp index 4c6bb4682..15eda0b56 100644 --- a/src/multimedia/qtmedianamespace.cpp +++ b/src/multimedia/qmultimedia.cpp @@ -25,13 +25,12 @@ ** ****************************************************************************/ -#include "qtmedianamespace.h" +#include "qmultimedia.h" QT_BEGIN_NAMESPACE /*! \namespace QMultimedia - \inheaderfile qtmedianamespace.h \ingroup multimedia \inmodule QtMultimedia diff --git a/src/multimedia/qtmedianamespace.h b/src/multimedia/qmultimedia.h index e7fdfb64b..336c4184e 100644 --- a/src/multimedia/qtmedianamespace.h +++ b/src/multimedia/qmultimedia.h @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#ifndef QTMEDIANAMESPACE_H -#define QTMEDIANAMESPACE_H +#ifndef QMULTIMEDIA_H +#define QMULTIMEDIA_H #include <QtCore/qpair.h> #include <QtCore/qmetatype.h> diff --git a/src/multimedia/recording/qmediaencodersettings.h b/src/multimedia/recording/qmediaencodersettings.h index 3f9bae3a5..6cd3e5586 100644 --- a/src/multimedia/recording/qmediaencodersettings.h +++ b/src/multimedia/recording/qmediaencodersettings.h @@ -47,7 +47,7 @@ #include <QtCore/qsize.h> #include <QtCore/qvariant.h> #include <qtmultimediadefs.h> -#include "qtmedianamespace.h" +#include "qmultimedia.h" QT_BEGIN_HEADER diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index 56ef888ed..1f27b6f35 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -42,7 +42,7 @@ #ifndef QMEDIARECORDER_H #define QMEDIARECORDER_H -#include <qtmedianamespace.h> +#include <qmultimedia.h> #include <qmediaobject.h> #include <qmediaencodersettings.h> #include <qmediabindableinterface.h> diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/video/qabstractvideobuffer.h index 9315605e1..59edc3226 100644 --- a/src/multimedia/video/qabstractvideobuffer.h +++ b/src/multimedia/video/qabstractvideobuffer.h @@ -43,7 +43,7 @@ #define QABSTRACTVIDEOBUFFER_H #include <qtmultimediadefs.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> #include <QtCore/qmetatype.h> diff --git a/src/multimedia/video/qabstractvideobuffer_p.h b/src/multimedia/video/qabstractvideobuffer_p.h index b06847a43..5b355ff1b 100644 --- a/src/multimedia/video/qabstractvideobuffer_p.h +++ b/src/multimedia/video/qabstractvideobuffer_p.h @@ -57,7 +57,7 @@ #include "qabstractvideobuffer.h" #include <qtmultimediadefs.h> -#include <qtmedianamespace.h> +#include <qmultimedia.h> QT_BEGIN_HEADER diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm b/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm index 3a7e860e6..7e7d88fb2 100644 --- a/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm +++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayermetadatacontrol.mm @@ -42,7 +42,7 @@ #include "avfmediaplayermetadatacontrol.h" #include "avfmediaplayersession.h" -#include <QtMultimedia/qtmedianamespace.h> +#include <QtMultimedia/qmultimedia.h> #import <AVFoundation/AVFoundation.h> diff --git a/sync.profile b/sync.profile index 477fe1ddb..5c92f2650 100644 --- a/sync.profile +++ b/sync.profile @@ -8,7 +8,8 @@ ); %classnames = ( - "qmediametadata.h" => "QMediaMetaData" + "qmediametadata.h" => "QMediaMetaData", + "qmultimedia.h" => "QMultimedia" ); # Module dependencies. |