From ee39683e273f705bfcffde8b6a9908230010843c Mon Sep 17 00:00:00 2001 From: Dmytro Poplavskiy Date: Mon, 6 Feb 2012 16:43:53 +1000 Subject: Moved QMediaServiceProvider to private header. It's not intended to be used by applications. Change-Id: I2acc26180ebb5c2419438169827f39aaf4578389 Reviewed-by: Michael Goddard --- src/imports/multimedia/qdeclarativemediabase.cpp | 2 +- src/imports/multimedia/qdeclarativemediabase_p.h | 2 +- src/multimedia/camera/qcamera.cpp | 2 +- src/multimedia/multimedia.pro | 2 +- src/multimedia/playback/qmediaplayer.cpp | 2 +- src/multimedia/qmediaserviceprovider.cpp | 8 +- src/multimedia/qmediaserviceprovider.h | 183 --------------------- src/multimedia/qmediaserviceprovider_p.h | 86 ++++++++++ src/multimedia/qmediaserviceproviderplugin.h | 103 +++++++++++- src/multimedia/radio/qradiodata.cpp | 2 +- src/multimedia/radio/qradiotuner.cpp | 2 +- src/multimedia/recording/qaudiorecorder.cpp | 2 +- src/multimedia/recording/qmediarecorder.cpp | 2 +- .../audiocapture/audiocaptureserviceplugin.cpp | 2 +- src/plugins/directshow/dsserviceplugin.cpp | 2 +- .../mediacapture/qgstreamercaptureservice.cpp | 2 +- src/plugins/gstreamer/qgstreamerserviceplugin.cpp | 2 +- src/plugins/qt7/qt7serviceplugin.mm | 2 +- .../qcamerabackend/tst_qcamerabackend.cpp | 2 +- .../qdeclarativeaudio/tst_qdeclarativeaudio.cpp | 2 +- .../tst_qmediaserviceprovider.cpp | 2 +- .../qmultimedia_common/mockmediaserviceprovider.h | 2 +- 22 files changed, 211 insertions(+), 205 deletions(-) delete mode 100644 src/multimedia/qmediaserviceprovider.h create mode 100644 src/multimedia/qmediaserviceprovider_p.h diff --git a/src/imports/multimedia/qdeclarativemediabase.cpp b/src/imports/multimedia/qdeclarativemediabase.cpp index 04d141a14..593afea36 100644 --- a/src/imports/multimedia/qdeclarativemediabase.cpp +++ b/src/imports/multimedia/qdeclarativemediabase.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include "qdeclarativemediametadata_p.h" diff --git a/src/imports/multimedia/qdeclarativemediabase_p.h b/src/imports/multimedia/qdeclarativemediabase_p.h index 095063ffd..9df5db1ce 100644 --- a/src/imports/multimedia/qdeclarativemediabase_p.h +++ b/src/imports/multimedia/qdeclarativemediabase_p.h @@ -55,7 +55,7 @@ #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp index 35de80379..730a27fb3 100644 --- a/src/multimedia/camera/qcamera.cpp +++ b/src/multimedia/camera/qcamera.cpp @@ -41,7 +41,7 @@ #include "qvideosurfaceoutput_p.h" #include "qmediaobject_p.h" -#include "qmediaserviceprovider.h" +#include "qmediaserviceprovider_p.h" #include #include diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index ab883d97d..e7d7b2f3a 100644 --- a/src/multimedia/multimedia.pro +++ b/src/multimedia/multimedia.pro @@ -26,6 +26,7 @@ PRIVATE_HEADERS += \ qmediaobject_p.h \ qmediapluginloader_p.h \ qmediaservice_p.h \ + qmediaserviceprovider_p.h \ PUBLIC_HEADERS += \ qmediabindableinterface.h \ @@ -33,7 +34,6 @@ PUBLIC_HEADERS += \ qmediaenumdebug.h \ qmediaobject.h \ qmediaservice.h \ - qmediaserviceprovider.h \ qmediaserviceproviderplugin.h \ qmediatimerange.h \ qtmedianamespace.h \ diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 5333b7f92..de7806086 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -45,7 +45,7 @@ #include "qmediaobject_p.h" #include #include -#include +#include #include #include #include diff --git a/src/multimedia/qmediaserviceprovider.cpp b/src/multimedia/qmediaserviceprovider.cpp index 6905c3a3a..45b60f3af 100644 --- a/src/multimedia/qmediaserviceprovider.cpp +++ b/src/multimedia/qmediaserviceprovider.cpp @@ -43,7 +43,7 @@ #include #include "qmediaservice.h" -#include "qmediaserviceprovider.h" +#include "qmediaserviceprovider_p.h" #include "qmediaserviceproviderplugin.h" #include "qmediapluginloader_p.h" #include "qmediaplayer.h" @@ -90,6 +90,8 @@ public: \ingroup multimedia_control \ingroup multimedia_core + \internal + The QMediaServiceProvider class uses hints to select an appropriate media service. */ @@ -533,6 +535,8 @@ Q_GLOBAL_STATIC(QPluginServiceProvider, pluginProvider); \ingroup multimedia_control \ingroup multimedia_core + \internal + \brief The QMediaServiceProvider class provides an abstract allocator for media services. */ @@ -742,7 +746,7 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() Returns a set of features supported by a plug-in \a service. */ -#include "moc_qmediaserviceprovider.cpp" +#include "moc_qmediaserviceprovider_p.cpp" #include "moc_qmediaserviceproviderplugin.cpp" QT_END_NAMESPACE diff --git a/src/multimedia/qmediaserviceprovider.h b/src/multimedia/qmediaserviceprovider.h deleted file mode 100644 index 018e33c65..000000000 --- a/src/multimedia/qmediaserviceprovider.h +++ /dev/null @@ -1,183 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QMEDIASERVICEPROVIDER_H -#define QMEDIASERVICEPROVIDER_H - -#include -#include -#include -#include "qtmedianamespace.h" - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -QT_MODULE(Multimedia) - - -class QMediaService; - -class QMediaServiceProviderHintPrivate; -class Q_MULTIMEDIA_EXPORT QMediaServiceProviderHint -{ -public: - enum Type { Null, ContentType, Device, SupportedFeatures }; - - enum Feature { - LowLatencyPlayback = 0x01, - RecordingSupport = 0x02, - StreamPlayback = 0x04, - VideoSurface = 0x08, - BackgroundPlayback = 0x10, - }; - Q_DECLARE_FLAGS(Features, Feature) - - QMediaServiceProviderHint(); - QMediaServiceProviderHint(const QString &mimeType, const QStringList& codecs); - QMediaServiceProviderHint(const QByteArray &device); - QMediaServiceProviderHint(Features features); - QMediaServiceProviderHint(const QMediaServiceProviderHint &other); - ~QMediaServiceProviderHint(); - - QMediaServiceProviderHint& operator=(const QMediaServiceProviderHint &other); - - bool operator == (const QMediaServiceProviderHint &other) const; - bool operator != (const QMediaServiceProviderHint &other) const; - - bool isNull() const; - - Type type() const; - - QString mimeType() const; - QStringList codecs() const; - - QByteArray device() const; - - Features features() const; - - //to be extended, if necessary - -private: - QSharedDataPointer d; -}; - -Q_DECLARE_OPERATORS_FOR_FLAGS(QMediaServiceProviderHint::Features) - -class Q_MULTIMEDIA_EXPORT QMediaServiceProvider : public QObject -{ - Q_OBJECT - -public: - virtual QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint = QMediaServiceProviderHint()) = 0; - virtual void releaseService(QMediaService *service) = 0; - - virtual QtMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType, - const QString &mimeType, - const QStringList& codecs, - int flags = 0) const; - virtual QStringList supportedMimeTypes(const QByteArray &serviceType, int flags = 0) const; - - virtual QList devices(const QByteArray &serviceType) const; - virtual QString deviceDescription(const QByteArray &serviceType, const QByteArray &device); - - static QMediaServiceProvider* defaultServiceProvider(); - static void setDefaultServiceProvider(QMediaServiceProvider *provider); -}; - -/*! - Service with support for media playback - Required Controls: QMediaPlayerControl - Optional Controls: QMediaPlaylistControl, QAudioDeviceControl - Video Output Controls (used by QWideoWidget and QGraphicsVideoItem): - Required: QVideoOutputControl - Optional: QVideoWindowControl, QVideoRendererControl, QVideoWidgetControl -*/ -#define Q_MEDIASERVICE_MEDIAPLAYER "com.nokia.qt.mediaplayer" - -/*! - Service with support for background media playback - Required Controls: QMediaPlayerControl, QMediaBackgroundPlaybackControl - Optional Controls: QMediaPlaylistControl, QAudioDeviceControl -*/ -#define Q_MEDIASERVICE_BACKGROUNDMEDIAPLAYER "com.nokia.qt.backgroundmediaplayer" - -/*! - Service with support for recording from audio sources - Required Controls: QAudioDeviceControl - Recording Controls (QMediaRecorder): - Required: QMediaRecorderControl - Recommended: QAudioEncoderControl - Optional: QMediaContainerControl -*/ -#define Q_MEDIASERVICE_AUDIOSOURCE "com.nokia.qt.audiosource" - -/*! - Service with support for camera use. - Required Controls: QCameraControl - Optional Controls: QCameraExposureControl, QCameraFocusControl, QCameraImageProcessingControl - Still Capture Controls: QCameraImageCaptureControl - Video Capture Controls (QMediaRecorder): - Required: QMediaRecorderControl - Recommended: QAudioEncoderControl, QVideoEncoderControl, QMediaContainerControl - Viewfinder Video Output Controls (used by QCameraViewfinder and QGraphicsVideoItem): - Required: QVideoOutputControl - Optional: QVideoWindowControl, QVideoRendererControl, QVideoWidgetControl -*/ -#define Q_MEDIASERVICE_CAMERA "com.nokia.qt.camera" - -/*! - Service with support for radio tuning. - Required Controls: QRadioTunerControl - Recording Controls (Optional, used by QMediaRecorder): - Required: QMediaRecorderControl - Recommended: QAudioEncoderControl - Optional: QMediaContainerControl -*/ -#define Q_MEDIASERVICE_RADIO "com.nokia.qt.radio" - - -QT_END_NAMESPACE - -QT_END_HEADER - - -#endif // QMEDIASERVICEPROVIDER_H diff --git a/src/multimedia/qmediaserviceprovider_p.h b/src/multimedia/qmediaserviceprovider_p.h new file mode 100644 index 000000000..1e09963b1 --- /dev/null +++ b/src/multimedia/qmediaserviceprovider_p.h @@ -0,0 +1,86 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QMEDIASERVICEPROVIDER_H +#define QMEDIASERVICEPROVIDER_H + +#include +#include +#include +#include "qtmedianamespace.h" +#include "qmediaserviceproviderplugin.h" + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Multimedia) + + +class QMediaService; + +class Q_MULTIMEDIA_EXPORT QMediaServiceProvider : public QObject +{ + Q_OBJECT + +public: + virtual QMediaService* requestService(const QByteArray &type, const QMediaServiceProviderHint &hint = QMediaServiceProviderHint()) = 0; + virtual void releaseService(QMediaService *service) = 0; + + virtual QtMultimedia::SupportEstimate hasSupport(const QByteArray &serviceType, + const QString &mimeType, + const QStringList& codecs, + int flags = 0) const; + virtual QStringList supportedMimeTypes(const QByteArray &serviceType, int flags = 0) const; + + virtual QList devices(const QByteArray &serviceType) const; + virtual QString deviceDescription(const QByteArray &serviceType, const QByteArray &device); + + static QMediaServiceProvider* defaultServiceProvider(); + static void setDefaultServiceProvider(QMediaServiceProvider *provider); +}; + +QT_END_NAMESPACE + +QT_END_HEADER + + +#endif // QMEDIASERVICEPROVIDER_H diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h index 9eed2a26b..55101c4b4 100644 --- a/src/multimedia/qmediaserviceproviderplugin.h +++ b/src/multimedia/qmediaserviceproviderplugin.h @@ -45,8 +45,8 @@ #include #include #include +#include #include -#include "qmediaserviceprovider.h" #ifdef Q_MOC_RUN # pragma Q_MOC_EXPAND_MACROS @@ -58,9 +58,55 @@ QT_BEGIN_NAMESPACE QT_MODULE(Multimedia) - class QMediaService; +class QMediaServiceProviderHintPrivate; +class Q_MULTIMEDIA_EXPORT QMediaServiceProviderHint +{ +public: + enum Type { Null, ContentType, Device, SupportedFeatures }; + + enum Feature { + LowLatencyPlayback = 0x01, + RecordingSupport = 0x02, + StreamPlayback = 0x04, + VideoSurface = 0x08, + BackgroundPlayback = 0x10, + }; + Q_DECLARE_FLAGS(Features, Feature) + + QMediaServiceProviderHint(); + QMediaServiceProviderHint(const QString &mimeType, const QStringList& codecs); + QMediaServiceProviderHint(const QByteArray &device); + QMediaServiceProviderHint(Features features); + QMediaServiceProviderHint(const QMediaServiceProviderHint &other); + ~QMediaServiceProviderHint(); + + QMediaServiceProviderHint& operator=(const QMediaServiceProviderHint &other); + + bool operator == (const QMediaServiceProviderHint &other) const; + bool operator != (const QMediaServiceProviderHint &other) const; + + bool isNull() const; + + Type type() const; + + QString mimeType() const; + QStringList codecs() const; + + QByteArray device() const; + + Features features() const; + + //to be extended, if necessary + +private: + QSharedDataPointer d; +}; + +Q_DECLARE_OPERATORS_FOR_FLAGS(QMediaServiceProviderHint::Features) + + struct Q_MULTIMEDIA_EXPORT QMediaServiceProviderFactoryInterface : public QFactoryInterface { virtual QStringList keys() const = 0; @@ -104,6 +150,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceFeaturesInterface virtual QMediaServiceProviderHint::Features supportedFeatures(const QByteArray &service) const = 0; }; + #define QMediaServiceFeaturesInterface_iid \ "com.nokia.Qt.QMediaServiceFeaturesInterface/1.0" Q_DECLARE_INTERFACE(QMediaServiceFeaturesInterface, QMediaServiceFeaturesInterface_iid) @@ -120,6 +167,58 @@ public: virtual void release(QMediaService *service) = 0; }; +/*! + Service with support for media playback + Required Controls: QMediaPlayerControl + Optional Controls: QMediaPlaylistControl, QAudioDeviceControl + Video Output Controls (used by QWideoWidget and QGraphicsVideoItem): + Required: QVideoOutputControl + Optional: QVideoWindowControl, QVideoRendererControl, QVideoWidgetControl +*/ +#define Q_MEDIASERVICE_MEDIAPLAYER "com.nokia.qt.mediaplayer" + +/*! + Service with support for background media playback + Required Controls: QMediaPlayerControl, QMediaBackgroundPlaybackControl + Optional Controls: QMediaPlaylistControl, QAudioDeviceControl +*/ +#define Q_MEDIASERVICE_BACKGROUNDMEDIAPLAYER "com.nokia.qt.backgroundmediaplayer" + +/*! + Service with support for recording from audio sources + Required Controls: QAudioDeviceControl + Recording Controls (QMediaRecorder): + Required: QMediaRecorderControl + Recommended: QAudioEncoderControl + Optional: QMediaContainerControl +*/ +#define Q_MEDIASERVICE_AUDIOSOURCE "com.nokia.qt.audiosource" + +/*! + Service with support for camera use. + Required Controls: QCameraControl + Optional Controls: QCameraExposureControl, QCameraFocusControl, QCameraImageProcessingControl + Still Capture Controls: QCameraImageCaptureControl + Video Capture Controls (QMediaRecorder): + Required: QMediaRecorderControl + Recommended: QAudioEncoderControl, QVideoEncoderControl, QMediaContainerControl + Viewfinder Video Output Controls (used by QCameraViewfinder and QGraphicsVideoItem): + Required: QVideoOutputControl + Optional: QVideoWindowControl, QVideoRendererControl, QVideoWidgetControl +*/ +#define Q_MEDIASERVICE_CAMERA "com.nokia.qt.camera" + +/*! + Service with support for radio tuning. + Required Controls: QRadioTunerControl + Recording Controls (Optional, used by QMediaRecorder): + Required: QMediaRecorderControl + Recommended: QAudioEncoderControl + Optional: QMediaContainerControl +*/ +#define Q_MEDIASERVICE_RADIO "com.nokia.qt.radio" + + QT_END_NAMESPACE QT_END_HEADER diff --git a/src/multimedia/radio/qradiodata.cpp b/src/multimedia/radio/qradiodata.cpp index b320a4034..7ea099c28 100644 --- a/src/multimedia/radio/qradiodata.cpp +++ b/src/multimedia/radio/qradiodata.cpp @@ -43,7 +43,7 @@ #include "qmediaservice.h" #include "qmediaobject_p.h" #include "qradiodatacontrol.h" -#include "qmediaserviceprovider.h" +#include "qmediaserviceprovider_p.h" #include diff --git a/src/multimedia/radio/qradiotuner.cpp b/src/multimedia/radio/qradiotuner.cpp index 69129a79b..30b77ebd8 100644 --- a/src/multimedia/radio/qradiotuner.cpp +++ b/src/multimedia/radio/qradiotuner.cpp @@ -43,7 +43,7 @@ #include "qmediaservice.h" #include "qmediaobject_p.h" #include "qradiotunercontrol.h" -#include "qmediaserviceprovider.h" +#include "qmediaserviceprovider_p.h" #include diff --git a/src/multimedia/recording/qaudiorecorder.cpp b/src/multimedia/recording/qaudiorecorder.cpp index 5a506b9f7..c3087ee71 100644 --- a/src/multimedia/recording/qaudiorecorder.cpp +++ b/src/multimedia/recording/qaudiorecorder.cpp @@ -44,7 +44,7 @@ #include "qmediaobject_p.h" #include "qmediarecorder_p.h" #include -#include +#include #include #include diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index 0360fe155..d1f3bdd1a 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -45,7 +45,7 @@ #include #include "qmediaobject_p.h" #include -#include +#include #include #include #include diff --git a/src/plugins/audiocapture/audiocaptureserviceplugin.cpp b/src/plugins/audiocapture/audiocaptureserviceplugin.cpp index 1cbedea92..11eb0c101 100644 --- a/src/plugins/audiocapture/audiocaptureserviceplugin.cpp +++ b/src/plugins/audiocapture/audiocaptureserviceplugin.cpp @@ -44,7 +44,7 @@ #include "audiocaptureserviceplugin.h" #include "audiocaptureservice.h" -#include "qmediaserviceprovider.h" +#include "qmediaserviceproviderplugin.h" QStringList AudioCaptureServicePlugin::keys() const diff --git a/src/plugins/directshow/dsserviceplugin.cpp b/src/plugins/directshow/dsserviceplugin.cpp index 52642b6a4..15b0ecfa3 100644 --- a/src/plugins/directshow/dsserviceplugin.cpp +++ b/src/plugins/directshow/dsserviceplugin.cpp @@ -55,7 +55,7 @@ #include "directshowplayerservice.h" #endif -#include +#include #ifdef QMEDIA_DIRECTSHOW_CAMERA diff --git a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp index 843a5726a..95b4444f3 100644 --- a/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp +++ b/src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp @@ -62,7 +62,7 @@ #include "qgstreamervideowidget.h" #endif -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/plugins/gstreamer/qgstreamerserviceplugin.cpp b/src/plugins/gstreamer/qgstreamerserviceplugin.cpp index 940f99dc3..d765fd70c 100644 --- a/src/plugins/gstreamer/qgstreamerserviceplugin.cpp +++ b/src/plugins/gstreamer/qgstreamerserviceplugin.cpp @@ -60,7 +60,7 @@ #include "camerabinservice.h" #endif -#include +#include #include #include diff --git a/src/plugins/qt7/qt7serviceplugin.mm b/src/plugins/qt7/qt7serviceplugin.mm index 386957681..0cc0a584d 100644 --- a/src/plugins/qt7/qt7serviceplugin.mm +++ b/src/plugins/qt7/qt7serviceplugin.mm @@ -49,7 +49,7 @@ #include "qt7serviceplugin.h" #include "qt7playerservice.h" -#include +#include QT_BEGIN_NAMESPACE diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index 31058ccd6..cbf495258 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -60,7 +60,7 @@ #include #include #include -#include +#include QT_USE_NAMESPACE diff --git a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp index 078c0ae83..4176604ba 100644 --- a/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp +++ b/tests/auto/unit/qdeclarativeaudio/tst_qdeclarativeaudio.cpp @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include diff --git a/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp index 7bfc378df..40ec395f0 100644 --- a/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp +++ b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include #include diff --git a/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h b/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h index 6fea80d38..b5086dc04 100644 --- a/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h +++ b/tests/auto/unit/qmultimedia_common/mockmediaserviceprovider.h @@ -42,7 +42,7 @@ #ifndef MOCKMEDIASERVICEPROVIDER_H #define MOCKMEDIASERVICEPROVIDER_H -#include "qmediaserviceprovider.h" +#include "private/qmediaserviceprovider_p.h" #include "qmediaservice.h" // Simple provider that lets you set the service -- cgit v1.2.3