summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-03-07 21:17:53 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-03-07 21:17:53 +0100
commit06a9505327f1c8aee70d701037b2cdcc4fc143f6 (patch)
tree242cec89d49078e912343afa8fc1ff92c7a8c2db
parent9500aadc219481d89d32e5c2a2de10b0740c50de (diff)
parent3198bf4944edd8f25996c2b4c4516f606165af59 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: src/plugins/avfoundation/mediaplayer/mediaplayer.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro Change-Id: I5742596230dc510ba2a09eba624429bb67179194
-rw-r--r--examples/multimediawidgets/player/main.cpp20
-rw-r--r--examples/multimediawidgets/player/player.cpp53
-rw-r--r--examples/multimediawidgets/player/player.h5
-rw-r--r--src/gsttools/qgstreamerbushelper.cpp40
-rw-r--r--src/multimedia/audio/qaudiodecoder.h2
-rw-r--r--src/multimedia/audio/qaudioinput.h4
-rw-r--r--src/multimedia/audio/qaudiooutput.h4
-rw-r--r--src/multimedia/audio/qaudioprobe.h2
-rw-r--r--src/multimedia/audio/qaudiosystemplugin.h2
-rw-r--r--src/multimedia/audio/qsound.h2
-rw-r--r--src/multimedia/audio/qsoundeffect.h2
-rw-r--r--src/multimedia/camera/qcamera.h8
-rw-r--r--src/multimedia/camera/qcameraexposure.h8
-rw-r--r--src/multimedia/camera/qcameraimagecapture.h4
-rw-r--r--src/multimedia/controls/qaudiodecodercontrol.h2
-rw-r--r--src/multimedia/controls/qaudioencodersettingscontrol.h4
-rw-r--r--src/multimedia/controls/qaudioinputselectorcontrol.h2
-rw-r--r--src/multimedia/controls/qaudiooutputselectorcontrol.h2
-rw-r--r--src/multimedia/controls/qaudiorolecontrol.h2
-rw-r--r--src/multimedia/controls/qcameracapturebufferformatcontrol.h2
-rw-r--r--src/multimedia/controls/qcameracapturedestinationcontrol.h2
-rw-r--r--src/multimedia/controls/qcameracontrol.h2
-rw-r--r--src/multimedia/controls/qcameraexposurecontrol.h2
-rw-r--r--src/multimedia/controls/qcamerafeedbackcontrol.h2
-rw-r--r--src/multimedia/controls/qcameraflashcontrol.h2
-rw-r--r--src/multimedia/controls/qcamerafocuscontrol.h2
-rw-r--r--src/multimedia/controls/qcameraimagecapturecontrol.h2
-rw-r--r--src/multimedia/controls/qcameraimageprocessingcontrol.h2
-rw-r--r--src/multimedia/controls/qcamerainfocontrol.h2
-rw-r--r--src/multimedia/controls/qcameralockscontrol.h2
-rw-r--r--src/multimedia/controls/qcameraviewfindersettingscontrol.h4
-rw-r--r--src/multimedia/controls/qcamerazoomcontrol.h2
-rw-r--r--src/multimedia/controls/qimageencodercontrol.h4
-rw-r--r--src/multimedia/controls/qmediaaudioprobecontrol.h2
-rw-r--r--src/multimedia/controls/qmediaavailabilitycontrol.h2
-rw-r--r--src/multimedia/controls/qmediacontainercontrol.h2
-rw-r--r--src/multimedia/controls/qmediagaplessplaybackcontrol.h2
-rw-r--r--src/multimedia/controls/qmedianetworkaccesscontrol.h2
-rw-r--r--src/multimedia/controls/qmediaplayercontrol.h2
-rw-r--r--src/multimedia/controls/qmediarecordercontrol.h2
-rw-r--r--src/multimedia/controls/qmediastreamscontrol.h2
-rw-r--r--src/multimedia/controls/qmediavideoprobecontrol.h2
-rw-r--r--src/multimedia/controls/qmetadatareadercontrol.h2
-rw-r--r--src/multimedia/controls/qmetadatawritercontrol.h2
-rw-r--r--src/multimedia/controls/qradiodatacontrol.h2
-rw-r--r--src/multimedia/controls/qradiotunercontrol.h2
-rw-r--r--src/multimedia/controls/qvideodeviceselectorcontrol.h2
-rw-r--r--src/multimedia/controls/qvideoencodersettingscontrol.h6
-rw-r--r--src/multimedia/controls/qvideorenderercontrol.h2
-rw-r--r--src/multimedia/controls/qvideowindowcontrol.h2
-rw-r--r--src/multimedia/multimedia.pro4
-rw-r--r--src/multimedia/playback/qmediaplayer.h8
-rw-r--r--src/multimedia/playback/qmediaplaylist.h10
-rw-r--r--src/multimedia/qmediacontrol.h4
-rw-r--r--src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h2
-rw-r--r--src/multimedia/radio/qradiodata.h2
-rw-r--r--src/multimedia/radio/qradiotuner.h2
-rw-r--r--src/multimedia/recording/qaudiorecorder.h2
-rw-r--r--src/multimedia/recording/qmediarecorder.h10
-rw-r--r--src/multimedia/video/qabstractvideofilter.h2
-rw-r--r--src/multimedia/video/qabstractvideosurface.h2
-rw-r--r--src/multimedia/video/qvideoprobe.h2
-rw-r--r--src/multimediawidgets/multimediawidgets.pro4
-rw-r--r--src/multimediawidgets/qcameraviewfinder.h2
-rw-r--r--src/multimediawidgets/qgraphicsvideoitem.h4
-rw-r--r--src/multimediawidgets/qvideowidget.h2
-rw-r--r--src/multimediawidgets/qvideowidgetcontrol.h2
-rw-r--r--src/plugins/alsa/alsa.pro8
-rw-r--r--src/plugins/android/src/src.pro9
-rw-r--r--src/plugins/android/videonode/videonode.pro11
-rw-r--r--src/plugins/audiocapture/audiocapture.pro8
-rw-r--r--src/plugins/avfoundation/camera/camera.pro11
-rw-r--r--src/plugins/avfoundation/mediaplayer/mediaplayer.pro11
-rw-r--r--src/plugins/coreaudio/coreaudio.pro8
-rw-r--r--src/plugins/directshow/directshow.pro7
-rw-r--r--src/plugins/gstreamer/audiodecoder/audiodecoder.pro7
-rw-r--r--src/plugins/gstreamer/camerabin/camerabin.pro8
-rw-r--r--src/plugins/gstreamer/common.pri1
-rw-r--r--src/plugins/gstreamer/mediacapture/mediacapture.pro8
-rw-r--r--src/plugins/gstreamer/mediaplayer/mediaplayer.pro8
-rw-r--r--src/plugins/m3u/m3u.pro8
-rw-r--r--src/plugins/opensles/opensles.pro8
-rw-r--r--src/plugins/pulseaudio/pulseaudio.pro8
-rw-r--r--src/plugins/pulseaudio/qaudiooutput_pulse.cpp39
-rw-r--r--src/plugins/qnx-audio/audio/audio.pro8
-rw-r--r--src/plugins/qnx/qnx.pro8
-rw-r--r--src/plugins/resourcepolicy/resourcepolicy.pro9
-rw-r--r--src/plugins/v4l/v4l.pro8
-rw-r--r--src/plugins/videonode/egl/egl.pro11
-rw-r--r--src/plugins/videonode/imx6/imx6.pro11
-rw-r--r--src/plugins/windowsaudio/windowsaudio.pro8
-rw-r--r--src/plugins/winrt/winrt.pro8
-rw-r--r--src/plugins/wmf/wmf.pro8
-rw-r--r--src/qtmultimediaquicktools/qtmultimediaquicktools.pro7
-rw-r--r--tests/auto/unit/qaudiodecoder/qaudiodecoder.pro8
-rw-r--r--tests/auto/unit/qaudioprobe/qaudioprobe.pro2
-rw-r--r--tests/auto/unit/qaudiorecorder/qaudiorecorder.pro2
-rw-r--r--tests/auto/unit/qmediaobject/qmediaobject.pro2
-rw-r--r--tests/auto/unit/qmediaplayer/qmediaplayer.pro2
-rw-r--r--tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro2
-rw-r--r--tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp2
-rw-r--r--tests/auto/unit/qmediarecorder/qmediarecorder.pro2
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro14
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro14
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro14
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro14
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro14
-rw-r--r--tests/auto/unit/qradiodata/qradiodata.pro2
-rw-r--r--tests/auto/unit/qradiotuner/qradiotuner.pro2
-rw-r--r--tests/auto/unit/qsamplecache/qsamplecache.pro2
-rw-r--r--tests/auto/unit/qvideoprobe/qvideoprobe.pro2
-rw-r--r--tests/auto/unit/qwavedecoder/qwavedecoder.pro2
112 files changed, 355 insertions, 303 deletions
diff --git a/examples/multimediawidgets/player/main.cpp b/examples/multimediawidgets/player/main.cpp
index c32cbc83..a3dabe15 100644
--- a/examples/multimediawidgets/player/main.cpp
+++ b/examples/multimediawidgets/player/main.cpp
@@ -41,13 +41,33 @@
#include "player.h"
#include <QApplication>
+#include <QCommandLineParser>
+#include <QCommandLineOption>
+#include <QDir>
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
+ QCoreApplication::setApplicationName("Player Example");
+ QCoreApplication::setOrganizationName("QtProject");
+ QCoreApplication::setApplicationVersion(QT_VERSION_STR);
+ QCommandLineParser parser;
+ parser.setApplicationDescription("Qt MultiMedia Player Example");
+ parser.addHelpOption();
+ parser.addVersionOption();
+ parser.addPositionalArgument("url", "The URL to open.");
+ parser.process(app);
+
Player player;
+ if (!parser.positionalArguments().isEmpty() && player.isPlayerAvailable()) {
+ QList<QUrl> urls;
+ foreach (const QString &a, parser.positionalArguments())
+ urls.append(QUrl::fromUserInput(a, QDir::currentPath(), QUrl::AssumeLocalFile));
+ player.addToPlaylist(urls);
+ }
+
#if defined(Q_WS_SIMULATOR)
player.setAttribute(Qt::WA_LockLandscapeOrientation);
player.showMaximized();
diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp
index b450bc36..e787aa26 100644
--- a/examples/multimediawidgets/player/player.cpp
+++ b/examples/multimediawidgets/player/player.cpp
@@ -167,7 +167,7 @@ Player::Player(QWidget *parent)
setLayout(layout);
- if (!player->isAvailable()) {
+ if (!isPlayerAvailable()) {
QMessageBox::warning(this, tr("Service not available"),
tr("The QMediaPlayer object does not have a valid service.\n"\
"Please check the media service plugins are installed."));
@@ -182,38 +182,47 @@ Player::Player(QWidget *parent)
}
metaDataChanged();
-
- QStringList arguments = qApp->arguments();
- arguments.removeAt(0);
- addToPlaylist(arguments);
}
Player::~Player()
{
}
+bool Player::isPlayerAvailable() const
+{
+ return player->isAvailable();
+}
+
void Player::open()
{
- QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Open Files"));
- addToPlaylist(fileNames);
+ QFileDialog fileDialog(this);
+ fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
+ fileDialog.setWindowTitle(tr("Open Files"));
+ QStringList supportedMimeTypes = player->supportedMimeTypes();
+ if (!supportedMimeTypes.isEmpty()) {
+ supportedMimeTypes.append("audio/x-m3u"); // MP3 playlists
+ fileDialog.setMimeTypeFilters(supportedMimeTypes);
+ }
+ fileDialog.setDirectory(QStandardPaths::standardLocations(QStandardPaths::MoviesLocation).value(0, QDir::homePath()));
+ if (fileDialog.exec() == QDialog::Accepted)
+ addToPlaylist(fileDialog.selectedUrls());
}
-void Player::addToPlaylist(const QStringList& fileNames)
+static bool isPlaylist(const QUrl &url) // Check for ".m3u" playlists.
{
- foreach (QString const &argument, fileNames) {
- QFileInfo fileInfo(argument);
- if (fileInfo.exists()) {
- QUrl url = QUrl::fromLocalFile(fileInfo.absoluteFilePath());
- if (fileInfo.suffix().toLower() == QLatin1String("m3u")) {
- playlist->load(url);
- } else
- playlist->addMedia(url);
- } else {
- QUrl url(argument);
- if (url.isValid()) {
- playlist->addMedia(url);
- }
- }
+ if (!url.isLocalFile())
+ return false;
+ const QFileInfo fileInfo(url.toLocalFile());
+ return fileInfo.exists() && !fileInfo.suffix().compare(QLatin1String("m3u"), Qt::CaseInsensitive);
+}
+
+void Player::addToPlaylist(const QList<QUrl> urls)
+{
+ foreach (const QUrl &url, urls) {
+ if (isPlaylist(url))
+ playlist->load(url);
+ else
+ playlist->addMedia(url);
}
}
diff --git a/examples/multimediawidgets/player/player.h b/examples/multimediawidgets/player/player.h
index 61f3cff2..7f5d0881 100644
--- a/examples/multimediawidgets/player/player.h
+++ b/examples/multimediawidgets/player/player.h
@@ -69,6 +69,10 @@ public:
Player(QWidget *parent = 0);
~Player();
+ bool isPlayerAvailable() const;
+
+ void addToPlaylist(const QList<QUrl> urls);
+
signals:
void fullScreenChanged(bool fullScreen);
@@ -93,7 +97,6 @@ private slots:
#ifndef PLAYER_NO_COLOROPTIONS
void showColorDialog();
#endif
- void addToPlaylist(const QStringList &fileNames);
private:
void setTrackInfo(const QString &info);
diff --git a/src/gsttools/qgstreamerbushelper.cpp b/src/gsttools/qgstreamerbushelper.cpp
index 95ba0c4e..bd35d4b0 100644
--- a/src/gsttools/qgstreamerbushelper.cpp
+++ b/src/gsttools/qgstreamerbushelper.cpp
@@ -41,6 +41,8 @@
#include <QtCore/qtimer.h>
#include <QtCore/qmutex.h>
#include <QtCore/qlist.h>
+#include <QtCore/qabstracteventdispatcher.h>
+#include <QtCore/qcoreapplication.h>
#include "qgstreamerbushelper_p.h"
@@ -53,31 +55,31 @@ class QGstreamerBusHelperPrivate : public QObject
public:
QGstreamerBusHelperPrivate(QGstreamerBusHelper *parent, GstBus* bus) :
QObject(parent),
+ m_tag(0),
m_bus(bus),
- m_helper(parent)
+ m_helper(parent),
+ m_intervalTimer(nullptr)
{
-#ifdef QT_NO_GLIB
- Q_UNUSED(bus);
-
- m_intervalTimer = new QTimer(this);
- m_intervalTimer->setInterval(250);
-
- connect(m_intervalTimer, SIGNAL(timeout()), SLOT(interval()));
- m_intervalTimer->start();
-#else
- m_tag = gst_bus_add_watch_full(bus, 0, busCallback, this, NULL);
-#endif
-
+ // glib event loop can be disabled either by env variable or QT_NO_GLIB define, so check the dispacher
+ QAbstractEventDispatcher *dispatcher = QCoreApplication::eventDispatcher();
+ const bool hasGlib = dispatcher && dispatcher->inherits("QEventDispatcherGlib");
+ if (!hasGlib) {
+ m_intervalTimer = new QTimer(this);
+ m_intervalTimer->setInterval(250);
+ connect(m_intervalTimer, SIGNAL(timeout()), SLOT(interval()));
+ m_intervalTimer->start();
+ } else {
+ m_tag = gst_bus_add_watch_full(bus, G_PRIORITY_DEFAULT, busCallback, this, NULL);
+ }
}
~QGstreamerBusHelperPrivate()
{
m_helper = 0;
-#ifdef QT_NO_GLIB
- m_intervalTimer->stop();
-#else
- g_source_remove(m_tag);
-#endif
+ delete m_intervalTimer;
+
+ if (m_tag)
+ g_source_remove(m_tag);
}
GstBus* bus() const { return m_bus; }
@@ -116,9 +118,7 @@ private:
guint m_tag;
GstBus* m_bus;
QGstreamerBusHelper* m_helper;
-#ifdef QT_NO_GLIB
QTimer* m_intervalTimer;
-#endif
private slots:
void doProcessMessage(const QGstreamerMessage& msg)
diff --git a/src/multimedia/audio/qaudiodecoder.h b/src/multimedia/audio/qaudiodecoder.h
index 6817d35d..a63a6836 100644
--- a/src/multimedia/audio/qaudiodecoder.h
+++ b/src/multimedia/audio/qaudiodecoder.h
@@ -75,7 +75,7 @@ public:
ServiceMissingError
};
- QAudioDecoder(QObject *parent = 0);
+ explicit QAudioDecoder(QObject *parent = Q_NULLPTR);
~QAudioDecoder();
static QMultimedia::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs = QStringList());
diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h
index ce20db4f..d1a58424 100644
--- a/src/multimedia/audio/qaudioinput.h
+++ b/src/multimedia/audio/qaudioinput.h
@@ -62,8 +62,8 @@ class Q_MULTIMEDIA_EXPORT QAudioInput : public QObject
Q_OBJECT
public:
- explicit QAudioInput(const QAudioFormat &format = QAudioFormat(), QObject *parent = 0);
- explicit QAudioInput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = 0);
+ explicit QAudioInput(const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR);
+ explicit QAudioInput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR);
~QAudioInput();
QAudioFormat format() const;
diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h
index 3b6c7db0..fab562ae 100644
--- a/src/multimedia/audio/qaudiooutput.h
+++ b/src/multimedia/audio/qaudiooutput.h
@@ -62,8 +62,8 @@ class Q_MULTIMEDIA_EXPORT QAudioOutput : public QObject
Q_OBJECT
public:
- explicit QAudioOutput(const QAudioFormat &format = QAudioFormat(), QObject *parent = 0);
- explicit QAudioOutput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = 0);
+ explicit QAudioOutput(const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR);
+ explicit QAudioOutput(const QAudioDeviceInfo &audioDeviceInfo, const QAudioFormat &format = QAudioFormat(), QObject *parent = Q_NULLPTR);
~QAudioOutput();
QAudioFormat format() const;
diff --git a/src/multimedia/audio/qaudioprobe.h b/src/multimedia/audio/qaudioprobe.h
index 499ff041..376a54e3 100644
--- a/src/multimedia/audio/qaudioprobe.h
+++ b/src/multimedia/audio/qaudioprobe.h
@@ -53,7 +53,7 @@ class Q_MULTIMEDIA_EXPORT QAudioProbe : public QObject
{
Q_OBJECT
public:
- explicit QAudioProbe(QObject *parent = 0);
+ explicit QAudioProbe(QObject *parent = Q_NULLPTR);
~QAudioProbe();
bool setSource(QMediaObject *source);
diff --git a/src/multimedia/audio/qaudiosystemplugin.h b/src/multimedia/audio/qaudiosystemplugin.h
index 4fa9faf0..b26b2a3b 100644
--- a/src/multimedia/audio/qaudiosystemplugin.h
+++ b/src/multimedia/audio/qaudiosystemplugin.h
@@ -78,7 +78,7 @@ class Q_MULTIMEDIA_EXPORT QAudioSystemPlugin : public QObject, public QAudioSyst
Q_INTERFACES(QAudioSystemFactoryInterface)
public:
- QAudioSystemPlugin(QObject *parent = 0);
+ explicit QAudioSystemPlugin(QObject *parent = Q_NULLPTR);
~QAudioSystemPlugin();
virtual QList<QByteArray> availableDevices(QAudio::Mode) const = 0;
diff --git a/src/multimedia/audio/qsound.h b/src/multimedia/audio/qsound.h
index 5e8e792d..f8d47676 100644
--- a/src/multimedia/audio/qsound.h
+++ b/src/multimedia/audio/qsound.h
@@ -58,7 +58,7 @@ public:
static void play(const QString& filename);
- explicit QSound(const QString& filename, QObject* parent = 0);
+ explicit QSound(const QString &filename, QObject *parent = Q_NULLPTR);
~QSound();
int loops() const;
diff --git a/src/multimedia/audio/qsoundeffect.h b/src/multimedia/audio/qsoundeffect.h
index c24600b2..f59c4d91 100644
--- a/src/multimedia/audio/qsoundeffect.h
+++ b/src/multimedia/audio/qsoundeffect.h
@@ -80,7 +80,7 @@ public:
Error
};
- explicit QSoundEffect(QObject *parent = 0);
+ explicit QSoundEffect(QObject *parent = Q_NULLPTR);
~QSoundEffect();
static QStringList supportedMimeTypes();
diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h
index 1c626748..7d706365 100644
--- a/src/multimedia/camera/qcamera.h
+++ b/src/multimedia/camera/qcamera.h
@@ -165,10 +165,10 @@ public:
FrontFace
};
- QCamera(QObject *parent = 0);
- QCamera(const QByteArray& deviceName, QObject *parent = 0);
- QCamera(const QCameraInfo& cameraInfo, QObject *parent = 0);
- QCamera(QCamera::Position position, QObject *parent = 0);
+ explicit QCamera(QObject *parent = Q_NULLPTR);
+ explicit QCamera(const QByteArray& deviceName, QObject *parent = Q_NULLPTR);
+ explicit QCamera(const QCameraInfo& cameraInfo, QObject *parent = Q_NULLPTR);
+ explicit QCamera(QCamera::Position position, QObject *parent = Q_NULLPTR);
~QCamera();
#if QT_DEPRECATED_SINCE(5, 3)
diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h
index c71bb857..e0924ca6 100644
--- a/src/multimedia/camera/qcameraexposure.h
+++ b/src/multimedia/camera/qcameraexposure.h
@@ -135,9 +135,9 @@ public:
qreal requestedAperture() const;
qreal requestedShutterSpeed() const;
- QList<int> supportedIsoSensitivities(bool *continuous = 0) const;
- QList<qreal> supportedApertures(bool * continuous = 0) const;
- QList<qreal> supportedShutterSpeeds(bool *continuous = 0) const;
+ QList<int> supportedIsoSensitivities(bool *continuous = Q_NULLPTR) const;
+ QList<qreal> supportedApertures(bool *continuous = Q_NULLPTR) const;
+ QList<qreal> supportedShutterSpeeds(bool *continuous = Q_NULLPTR) const;
public Q_SLOTS:
void setFlashMode(FlashModes mode);
@@ -168,7 +168,7 @@ Q_SIGNALS:
private:
friend class QCamera;
friend class QCameraPrivate;
- explicit QCameraExposure(QCamera *parent = 0);
+ explicit QCameraExposure(QCamera *parent = Q_NULLPTR);
virtual ~QCameraExposure();
Q_DISABLE_COPY(QCameraExposure)
diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h
index 190dabb1..3f3c6bd2 100644
--- a/src/multimedia/camera/qcameraimagecapture.h
+++ b/src/multimedia/camera/qcameraimagecapture.h
@@ -87,7 +87,7 @@ public:
};
Q_DECLARE_FLAGS(CaptureDestinations, CaptureDestination)
- QCameraImageCapture(QMediaObject *mediaObject, QObject *parent = 0);
+ explicit QCameraImageCapture(QMediaObject *mediaObject, QObject *parent = Q_NULLPTR);
~QCameraImageCapture();
bool isAvailable() const;
@@ -104,7 +104,7 @@ public:
QString imageCodecDescription(const QString &codecName) const;
QList<QSize> supportedResolutions(const QImageEncoderSettings &settings = QImageEncoderSettings(),
- bool *continuous = 0) const;
+ bool *continuous = Q_NULLPTR) const;
QImageEncoderSettings encodingSettings() const;
void setEncodingSettings(const QImageEncoderSettings& settings);
diff --git a/src/multimedia/controls/qaudiodecodercontrol.h b/src/multimedia/controls/qaudiodecodercontrol.h
index d864da4f..f02da496 100644
--- a/src/multimedia/controls/qaudiodecodercontrol.h
+++ b/src/multimedia/controls/qaudiodecodercontrol.h
@@ -92,7 +92,7 @@ Q_SIGNALS:
void durationChanged(qint64 duration);
protected:
- QAudioDecoderControl(QObject* parent = 0);
+ explicit QAudioDecoderControl(QObject *parent = Q_NULLPTR);
};
#define QAudioDecoderControl_iid "org.qt-project.qt.audiodecodercontrol/5.0"
diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.h b/src/multimedia/controls/qaudioencodersettingscontrol.h
index 77a72ed8..1906904d 100644
--- a/src/multimedia/controls/qaudioencodersettingscontrol.h
+++ b/src/multimedia/controls/qaudioencodersettingscontrol.h
@@ -67,13 +67,13 @@ public:
virtual QString codecDescription(const QString &codecName) const = 0;
virtual QList<int> supportedSampleRates(const QAudioEncoderSettings &settings,
- bool *continuous = 0) const = 0;
+ bool *continuous = Q_NULLPTR) const = 0;
virtual QAudioEncoderSettings audioSettings() const = 0;
virtual void setAudioSettings(const QAudioEncoderSettings&) = 0;
protected:
- QAudioEncoderSettingsControl(QObject *parent = 0);
+ explicit QAudioEncoderSettingsControl(QObject *parent = Q_NULLPTR);
};
#define QAudioEncoderSettingsControl_iid "org.qt-project.qt.audioencodersettingscontrol/5.0"
diff --git a/src/multimedia/controls/qaudioinputselectorcontrol.h b/src/multimedia/controls/qaudioinputselectorcontrol.h
index 98c9c7b8..eceaa76d 100644
--- a/src/multimedia/controls/qaudioinputselectorcontrol.h
+++ b/src/multimedia/controls/qaudioinputselectorcontrol.h
@@ -68,7 +68,7 @@ Q_SIGNALS:
void availableInputsChanged();
protected:
- QAudioInputSelectorControl(QObject *parent = 0);
+ explicit QAudioInputSelectorControl(QObject *parent = Q_NULLPTR);
};
#define QAudioInputSelectorControl_iid "org.qt-project.qt.audioinputselectorcontrol/5.0"
diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.h b/src/multimedia/controls/qaudiooutputselectorcontrol.h
index 4c7be6d7..b2d27a34 100644
--- a/src/multimedia/controls/qaudiooutputselectorcontrol.h
+++ b/src/multimedia/controls/qaudiooutputselectorcontrol.h
@@ -68,7 +68,7 @@ Q_SIGNALS:
void availableOutputsChanged();
protected:
- QAudioOutputSelectorControl(QObject *parent = 0);
+ explicit QAudioOutputSelectorControl(QObject *parent = Q_NULLPTR);
};
#define QAudioOutputSelectorControl_iid "org.qt-project.qt.audiooutputselectorcontrol/5.0"
diff --git a/src/multimedia/controls/qaudiorolecontrol.h b/src/multimedia/controls/qaudiorolecontrol.h
index 1dd9271e..5d9db177 100644
--- a/src/multimedia/controls/qaudiorolecontrol.h
+++ b/src/multimedia/controls/qaudiorolecontrol.h
@@ -64,7 +64,7 @@ Q_SIGNALS:
void audioRoleChanged(QAudio::Role role);
protected:
- explicit QAudioRoleControl(QObject *parent = 0);
+ explicit QAudioRoleControl(QObject *parent = Q_NULLPTR);
};
#define QAudioRoleControl_iid "org.qt-project.qt.audiorolecontrol/5.6"
diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.h b/src/multimedia/controls/qcameracapturebufferformatcontrol.h
index ecac16f8..cb8c3d6d 100644
--- a/src/multimedia/controls/qcameracapturebufferformatcontrol.h
+++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.h
@@ -62,7 +62,7 @@ Q_SIGNALS:
void bufferFormatChanged(QVideoFrame::PixelFormat);
protected:
- QCameraCaptureBufferFormatControl(QObject* parent = 0);
+ explicit QCameraCaptureBufferFormatControl(QObject *parent = Q_NULLPTR);
};
#define QCameraCaptureBufferFormatControl_iid "org.qt-project.qt.cameracapturebufferformatcontrol/5.0"
diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.h b/src/multimedia/controls/qcameracapturedestinationcontrol.h
index ee0246ec..90142d6b 100644
--- a/src/multimedia/controls/qcameracapturedestinationcontrol.h
+++ b/src/multimedia/controls/qcameracapturedestinationcontrol.h
@@ -62,7 +62,7 @@ Q_SIGNALS:
void captureDestinationChanged(QCameraImageCapture::CaptureDestinations);
protected:
- QCameraCaptureDestinationControl(QObject* parent = 0);
+ explicit QCameraCaptureDestinationControl(QObject *parent = Q_NULLPTR);
};
#define QCameraCaptureDestinationControl_iid "org.qt-project.qt.cameracapturedestinationcontrol/5.0"
diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h
index b7b0b6cb..f17af0ce 100644
--- a/src/multimedia/controls/qcameracontrol.h
+++ b/src/multimedia/controls/qcameracontrol.h
@@ -83,7 +83,7 @@ Q_SIGNALS:
void captureModeChanged(QCamera::CaptureModes);
protected:
- QCameraControl(QObject* parent = 0);
+ explicit QCameraControl(QObject *parent = Q_NULLPTR);
};
#define QCameraControl_iid "org.qt-project.qt.cameracontrol/5.0"
diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h
index 891683ea..88dda12e 100644
--- a/src/multimedia/controls/qcameraexposurecontrol.h
+++ b/src/multimedia/controls/qcameraexposurecontrol.h
@@ -87,7 +87,7 @@ Q_SIGNALS:
void parameterRangeChanged(int parameter);
protected:
- QCameraExposureControl(QObject* parent = 0);
+ explicit QCameraExposureControl(QObject *parent = Q_NULLPTR);
};
#define QCameraExposureControl_iid "org.qt-project.qt.cameraexposurecontrol/5.0"
diff --git a/src/multimedia/controls/qcamerafeedbackcontrol.h b/src/multimedia/controls/qcamerafeedbackcontrol.h
index b99c7120..cee97210 100644
--- a/src/multimedia/controls/qcamerafeedbackcontrol.h
+++ b/src/multimedia/controls/qcamerafeedbackcontrol.h
@@ -84,7 +84,7 @@ public:
virtual bool setEventFeedbackSound(EventType, const QString &filePath) = 0;
protected:
- QCameraFeedbackControl(QObject* parent = 0);
+ explicit QCameraFeedbackControl(QObject *parent = Q_NULLPTR);
};
#define QCameraFeedbackControl_iid "org.qt-project.qt.camerafeedbackcontrol/5.0"
diff --git a/src/multimedia/controls/qcameraflashcontrol.h b/src/multimedia/controls/qcameraflashcontrol.h
index 6ceccd67..08e991f5 100644
--- a/src/multimedia/controls/qcameraflashcontrol.h
+++ b/src/multimedia/controls/qcameraflashcontrol.h
@@ -68,7 +68,7 @@ Q_SIGNALS:
void flashReady(bool);
protected:
- QCameraFlashControl(QObject* parent = 0);
+ explicit QCameraFlashControl(QObject *parent = Q_NULLPTR);
};
#define QCameraFlashControl_iid "org.qt-project.qt.cameraflashcontrol/5.0"
diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h
index accbd3a4..32da7cc3 100644
--- a/src/multimedia/controls/qcamerafocuscontrol.h
+++ b/src/multimedia/controls/qcamerafocuscontrol.h
@@ -77,7 +77,7 @@ Q_SIGNALS:
void focusZonesChanged();
protected:
- QCameraFocusControl(QObject* parent = 0);
+ explicit QCameraFocusControl(QObject *parent = Q_NULLPTR);
};
#define QCameraFocusControl_iid "org.qt-project.qt.camerafocuscontrol/5.0"
diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h
index 94d4e2a7..4fe7b938 100644
--- a/src/multimedia/controls/qcameraimagecapturecontrol.h
+++ b/src/multimedia/controls/qcameraimagecapturecontrol.h
@@ -80,7 +80,7 @@ Q_SIGNALS:
void error(int id, int error, const QString &errorString);
protected:
- QCameraImageCaptureControl(QObject* parent = 0);
+ explicit QCameraImageCaptureControl(QObject *parent = Q_NULLPTR);
};
#define QCameraImageCaptureControl_iid "org.qt-project.qt.cameraimagecapturecontrol/5.0"
diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.h b/src/multimedia/controls/qcameraimageprocessingcontrol.h
index eee45aa6..ee46143e 100644
--- a/src/multimedia/controls/qcameraimageprocessingcontrol.h
+++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h
@@ -82,7 +82,7 @@ public:
virtual void setParameter(ProcessingParameter parameter, const QVariant &value) = 0;
protected:
- QCameraImageProcessingControl(QObject* parent = 0);
+ explicit QCameraImageProcessingControl(QObject *parent = Q_NULLPTR);
};
#define QCameraImageProcessingControl_iid "org.qt-project.qt.cameraimageprocessingcontrol/5.0"
diff --git a/src/multimedia/controls/qcamerainfocontrol.h b/src/multimedia/controls/qcamerainfocontrol.h
index 3156761a..32f85fc3 100644
--- a/src/multimedia/controls/qcamerainfocontrol.h
+++ b/src/multimedia/controls/qcamerainfocontrol.h
@@ -58,7 +58,7 @@ public:
virtual int cameraOrientation(const QString &deviceName) const = 0;
protected:
- QCameraInfoControl(QObject *parent = 0);
+ explicit QCameraInfoControl(QObject *parent = Q_NULLPTR);
};
#define QCameraInfoControl_iid "org.qt-project.qt.camerainfocontrol/5.3"
diff --git a/src/multimedia/controls/qcameralockscontrol.h b/src/multimedia/controls/qcameralockscontrol.h
index b830f01f..01178642 100644
--- a/src/multimedia/controls/qcameralockscontrol.h
+++ b/src/multimedia/controls/qcameralockscontrol.h
@@ -67,7 +67,7 @@ Q_SIGNALS:
void lockStatusChanged(QCamera::LockType type, QCamera::LockStatus status, QCamera::LockChangeReason reason);
protected:
- QCameraLocksControl(QObject* parent = 0);
+ explicit QCameraLocksControl(QObject *parent = Q_NULLPTR);
};
#define QCameraLocksControl_iid "org.qt-project.qt.cameralockscontrol/5.0"
diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.h b/src/multimedia/controls/qcameraviewfindersettingscontrol.h
index aa3dd913..c67fdaab 100644
--- a/src/multimedia/controls/qcameraviewfindersettingscontrol.h
+++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.h
@@ -70,7 +70,7 @@ public:
virtual void setViewfinderParameter(ViewfinderParameter parameter, const QVariant &value) = 0;
protected:
- QCameraViewfinderSettingsControl(QObject *parent = 0);
+ explicit QCameraViewfinderSettingsControl(QObject *parent = Q_NULLPTR);
};
#define QCameraViewfinderSettingsControl_iid "org.qt-project.qt.cameraviewfindersettingscontrol/5.0"
@@ -92,7 +92,7 @@ public:
virtual void setViewfinderSettings(const QCameraViewfinderSettings &settings) = 0;
protected:
- QCameraViewfinderSettingsControl2(QObject *parent = 0);
+ explicit QCameraViewfinderSettingsControl2(QObject *parent = Q_NULLPTR);
};
#define QCameraViewfinderSettingsControl2_iid "org.qt-project.qt.cameraviewfindersettingscontrol2/5.5"
diff --git a/src/multimedia/controls/qcamerazoomcontrol.h b/src/multimedia/controls/qcamerazoomcontrol.h
index 67763d30..776d6dda 100644
--- a/src/multimedia/controls/qcamerazoomcontrol.h
+++ b/src/multimedia/controls/qcamerazoomcontrol.h
@@ -75,7 +75,7 @@ Q_SIGNALS:
void currentDigitalZoomChanged(qreal digitalZoom);
protected:
- QCameraZoomControl(QObject* parent = 0);
+ explicit QCameraZoomControl(QObject *parent = Q_NULLPTR);
};
#define QCameraZoomControl_iid "org.qt-project.qt.camerazoomcontrol/5.0"
diff --git a/src/multimedia/controls/qimageencodercontrol.h b/src/multimedia/controls/qimageencodercontrol.h
index 023e9beb..292e16b1 100644
--- a/src/multimedia/controls/qimageencodercontrol.h
+++ b/src/multimedia/controls/qimageencodercontrol.h
@@ -68,13 +68,13 @@ public:
virtual QString imageCodecDescription(const QString &codecName) const = 0;
virtual QList<QSize> supportedResolutions(const QImageEncoderSettings &settings,
- bool *continuous = 0) const = 0;
+ bool *continuous = Q_NULLPTR) const = 0;
virtual QImageEncoderSettings imageSettings() const = 0;
virtual void setImageSettings(const QImageEncoderSettings &settings) = 0;
protected:
- QImageEncoderControl(QObject *parent = 0);
+ explicit QImageEncoderControl(QObject *parent = Q_NULLPTR);
};
#define QImageEncoderControl_iid "org.qt-project.qt.imageencodercontrol/5.0"
diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.h b/src/multimedia/controls/qmediaaudioprobecontrol.h
index c5e38492..9d679c76 100644
--- a/src/multimedia/controls/qmediaaudioprobecontrol.h
+++ b/src/multimedia/controls/qmediaaudioprobecontrol.h
@@ -56,7 +56,7 @@ Q_SIGNALS:
void flush();
protected:
- explicit QMediaAudioProbeControl(QObject *parent = 0);
+ explicit QMediaAudioProbeControl(QObject *parent = Q_NULLPTR);
};
#define QMediaAudioProbeControl_iid "org.qt-project.qt.mediaaudioprobecontrol/5.0"
diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h
index 7bab5c0f..55149ccb 100644
--- a/src/multimedia/controls/qmediaavailabilitycontrol.h
+++ b/src/multimedia/controls/qmediaavailabilitycontrol.h
@@ -62,7 +62,7 @@ Q_SIGNALS:
void availabilityChanged(QMultimedia::AvailabilityStatus availability);
protected:
- QMediaAvailabilityControl(QObject* parent = 0);
+ explicit QMediaAvailabilityControl(QObject *parent = Q_NULLPTR);
};
#define QMediaAvailabilityControl_iid "org.qt-project.qt.mediaavailabilitycontrol/5.0"
diff --git a/src/multimedia/controls/qmediacontainercontrol.h b/src/multimedia/controls/qmediacontainercontrol.h
index 8e17b98f..8c315590 100644
--- a/src/multimedia/controls/qmediacontainercontrol.h
+++ b/src/multimedia/controls/qmediacontainercontrol.h
@@ -62,7 +62,7 @@ public:
virtual QString containerDescription(const QString &formatMimeType) const = 0;
protected:
- QMediaContainerControl(QObject *parent = 0);
+ explicit QMediaContainerControl(QObject *parent = Q_NULLPTR);
};
#define QMediaContainerControl_iid "org.qt-project.qt.mediacontainercontrol/5.0"
diff --git a/src/multimedia/controls/qmediagaplessplaybackcontrol.h b/src/multimedia/controls/qmediagaplessplaybackcontrol.h
index e9a1472e..8ab31ef6 100644
--- a/src/multimedia/controls/qmediagaplessplaybackcontrol.h
+++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.h
@@ -66,7 +66,7 @@ Q_SIGNALS:
void advancedToNextMedia();
protected:
- QMediaGaplessPlaybackControl(QObject* parent = 0);
+ explicit QMediaGaplessPlaybackControl(QObject *parent = Q_NULLPTR);
};
#define QMediaGaplessPlaybackControl_iid "org.qt-project.qt.mediagaplessplaybackcontrol/5.0"
diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.h b/src/multimedia/controls/qmedianetworkaccesscontrol.h
index 118e315a..1c258a0b 100644
--- a/src/multimedia/controls/qmedianetworkaccesscontrol.h
+++ b/src/multimedia/controls/qmedianetworkaccesscontrol.h
@@ -65,7 +65,7 @@ Q_SIGNALS:
void configurationChanged(const QNetworkConfiguration& configuration);
protected:
- QMediaNetworkAccessControl(QObject *parent = 0);
+ explicit QMediaNetworkAccessControl(QObject *parent = Q_NULLPTR);
};
#define QMediaNetworkAccessControl_iid "org.qt-project.qt.medianetworkaccesscontrol/5.0"
diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h
index 416cfa5f..a3fb1d4e 100644
--- a/src/multimedia/controls/qmediaplayercontrol.h
+++ b/src/multimedia/controls/qmediaplayercontrol.h
@@ -110,7 +110,7 @@ Q_SIGNALS:
void error(int error, const QString &errorString);
protected:
- QMediaPlayerControl(QObject* parent = 0);
+ explicit QMediaPlayerControl(QObject *parent = Q_NULLPTR);
};
#define QMediaPlayerControl_iid "org.qt-project.qt.mediaplayercontrol/5.0"
diff --git a/src/multimedia/controls/qmediarecordercontrol.h b/src/multimedia/controls/qmediarecordercontrol.h
index 297640f2..85f5c78d 100644
--- a/src/multimedia/controls/qmediarecordercontrol.h
+++ b/src/multimedia/controls/qmediarecordercontrol.h
@@ -88,7 +88,7 @@ public Q_SLOTS:
virtual void setVolume(qreal volume) = 0;
protected:
- QMediaRecorderControl(QObject* parent = 0);
+ explicit QMediaRecorderControl(QObject *parent = Q_NULLPTR);
};
#define QMediaRecorderControl_iid "org.qt-project.qt.mediarecordercontrol/5.0"
diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h
index db738c92..ea12dd18 100644
--- a/src/multimedia/controls/qmediastreamscontrol.h
+++ b/src/multimedia/controls/qmediastreamscontrol.h
@@ -73,7 +73,7 @@ Q_SIGNALS:
void activeStreamsChanged();
protected:
- QMediaStreamsControl(QObject *parent = 0);
+ explicit QMediaStreamsControl(QObject *parent = Q_NULLPTR);
};
#define QMediaStreamsControl_iid "org.qt-project.qt.mediastreamscontrol/5.0"
diff --git a/src/multimedia/controls/qmediavideoprobecontrol.h b/src/multimedia/controls/qmediavideoprobecontrol.h
index 3adea584..25caefee 100644
--- a/src/multimedia/controls/qmediavideoprobecontrol.h
+++ b/src/multimedia/controls/qmediavideoprobecontrol.h
@@ -58,7 +58,7 @@ Q_SIGNALS:
void flush();
protected:
- explicit QMediaVideoProbeControl(QObject *parent = 0);
+ explicit QMediaVideoProbeControl(QObject *parent = Q_NULLPTR);
};
#define QMediaVideoProbeControl_iid "org.qt-project.qt.mediavideoprobecontrol/5.0"
diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h
index 4923be10..9162d645 100644
--- a/src/multimedia/controls/qmetadatareadercontrol.h
+++ b/src/multimedia/controls/qmetadatareadercontrol.h
@@ -71,7 +71,7 @@ Q_SIGNALS:
void metaDataAvailableChanged(bool available);
protected:
- QMetaDataReaderControl(QObject *parent = 0);
+ explicit QMetaDataReaderControl(QObject *parent = Q_NULLPTR);
};
#define QMetaDataReaderControl_iid "org.qt-project.qt.metadatareadercontrol/5.0"
diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h
index adef3af8..1c2f4cf6 100644
--- a/src/multimedia/controls/qmetadatawritercontrol.h
+++ b/src/multimedia/controls/qmetadatawritercontrol.h
@@ -74,7 +74,7 @@ Q_SIGNALS:
void metaDataAvailableChanged(bool available);
protected:
- QMetaDataWriterControl(QObject *parent = 0);
+ explicit QMetaDataWriterControl(QObject *parent = Q_NULLPTR);
};
#define QMetaDataWriterControl_iid "org.qt-project.qt.metadatawritercontrol/5.0"
diff --git a/src/multimedia/controls/qradiodatacontrol.h b/src/multimedia/controls/qradiodatacontrol.h
index e61978d8..28b3a57b 100644
--- a/src/multimedia/controls/qradiodatacontrol.h
+++ b/src/multimedia/controls/qradiodatacontrol.h
@@ -76,7 +76,7 @@ Q_SIGNALS:
void error(QRadioData::Error err);
protected:
- QRadioDataControl(QObject *parent = 0);
+ explicit QRadioDataControl(QObject *parent = Q_NULLPTR);
};
#define QRadioDataControl_iid "org.qt-project.qt.radiodatacontrol/5.0"
diff --git a/src/multimedia/controls/qradiotunercontrol.h b/src/multimedia/controls/qradiotunercontrol.h
index 106e3e27..9a9e1205 100644
--- a/src/multimedia/controls/qradiotunercontrol.h
+++ b/src/multimedia/controls/qradiotunercontrol.h
@@ -107,7 +107,7 @@ Q_SIGNALS:
void antennaConnectedChanged(bool connectionStatus);
protected:
- QRadioTunerControl(QObject *parent = 0);
+ explicit QRadioTunerControl(QObject *parent = Q_NULLPTR);
};
#define QRadioTunerControl_iid "org.qt-project.qt.radiotunercontrol/5.0"
diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.h b/src/multimedia/controls/qvideodeviceselectorcontrol.h
index de154aaf..10a703bb 100644
--- a/src/multimedia/controls/qvideodeviceselectorcontrol.h
+++ b/src/multimedia/controls/qvideodeviceselectorcontrol.h
@@ -71,7 +71,7 @@ Q_SIGNALS:
void devicesChanged();
protected:
- QVideoDeviceSelectorControl(QObject *parent = 0);
+ explicit QVideoDeviceSelectorControl(QObject *parent = Q_NULLPTR);
};
#define QVideoDeviceSelectorControl_iid "org.qt-project.qt.videodeviceselectorcontrol/5.0"
diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.h b/src/multimedia/controls/qvideoencodersettingscontrol.h
index 4bf8c4d4..ea1401ae 100644
--- a/src/multimedia/controls/qvideoencodersettingscontrol.h
+++ b/src/multimedia/controls/qvideoencodersettingscontrol.h
@@ -65,10 +65,10 @@ public:
virtual ~QVideoEncoderSettingsControl();
virtual QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings,
- bool *continuous = 0) const = 0;
+ bool *continuous = Q_NULLPTR) const = 0;
virtual QList<qreal> supportedFrameRates(const QVideoEncoderSettings &settings,
- bool *continuous = 0) const = 0;
+ bool *continuous = Q_NULLPTR) const = 0;
virtual QStringList supportedVideoCodecs() const = 0;
virtual QString videoCodecDescription(const QString &codecName) const = 0;
@@ -77,7 +77,7 @@ public:
virtual void setVideoSettings(const QVideoEncoderSettings &settings) = 0;
protected:
- QVideoEncoderSettingsControl(QObject *parent = 0);
+ explicit QVideoEncoderSettingsControl(QObject *parent = Q_NULLPTR);
};
#define QVideoEncoderSettingsControl_iid "org.qt-project.qt.videoencodersettingscontrol/5.0"
diff --git a/src/multimedia/controls/qvideorenderercontrol.h b/src/multimedia/controls/qvideorenderercontrol.h
index 6c460631..2ddab28e 100644
--- a/src/multimedia/controls/qvideorenderercontrol.h
+++ b/src/multimedia/controls/qvideorenderercontrol.h
@@ -56,7 +56,7 @@ public:
virtual void setSurface(QAbstractVideoSurface *surface) = 0;
protected:
- QVideoRendererControl(QObject *parent = 0);
+ explicit QVideoRendererControl(QObject *parent = Q_NULLPTR);
};
#define QVideoRendererControl_iid "org.qt-project.qt.videorenderercontrol/5.0"
diff --git a/src/multimedia/controls/qvideowindowcontrol.h b/src/multimedia/controls/qvideowindowcontrol.h
index 6b9478b1..d26579dd 100644
--- a/src/multimedia/controls/qvideowindowcontrol.h
+++ b/src/multimedia/controls/qvideowindowcontrol.h
@@ -94,7 +94,7 @@ Q_SIGNALS:
void nativeSizeChanged();
protected:
- QVideoWindowControl(QObject *parent = 0);
+ explicit QVideoWindowControl(QObject *parent = Q_NULLPTR);
};
#define QVideoWindowControl_iid "org.qt-project.qt.videowindowcontrol/5.0"
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index b16a792f..acde6fe8 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -12,8 +12,6 @@ MODULE_PLUGIN_TYPES = \
QMAKE_DOCS = $$PWD/doc/qtmultimedia.qdocconf
-load(qt_module)
-
INCLUDEPATH *= .
PRIVATE_HEADERS += \
@@ -87,3 +85,5 @@ ANDROID_FEATURES += \
win32: LIBS_PRIVATE += -luuid
HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
+
+load(qt_module)
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h
index 6babc281..f8d91b99 100644
--- a/src/multimedia/playback/qmediaplayer.h
+++ b/src/multimedia/playback/qmediaplayer.h
@@ -119,13 +119,13 @@ public:
MediaIsPlaylist
};
- QMediaPlayer(QObject *parent = 0, Flags flags = 0);
+ explicit QMediaPlayer(QObject *parent = Q_NULLPTR, Flags flags = Flags());
~QMediaPlayer();
static QMultimedia::SupportEstimate hasSupport(const QString &mimeType,
const QStringList& codecs = QStringList(),
- Flags flags = 0);
- static QStringList supportedMimeTypes(Flags flags = 0);
+ Flags flags = Flags());
+ static QStringList supportedMimeTypes(Flags flags = Flags());
void setVideoOutput(QVideoWidget *);
void setVideoOutput(QGraphicsVideoItem *);
@@ -174,7 +174,7 @@ public Q_SLOTS:
void setPlaybackRate(qreal rate);
- void setMedia(const QMediaContent &media, QIODevice *stream = 0);
+ void setMedia(const QMediaContent &media, QIODevice *stream = Q_NULLPTR);
void setPlaylist(QMediaPlaylist *playlist);
void setNetworkConfigurations(const QList<QNetworkConfiguration> &configurations);
diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h
index 1fa75a24..05ab8f42 100644
--- a/src/multimedia/playback/qmediaplaylist.h
+++ b/src/multimedia/playback/qmediaplaylist.h
@@ -67,7 +67,7 @@ public:
enum PlaybackMode { CurrentItemOnce, CurrentItemInLoop, Sequential, Loop, Random };
enum Error { NoError, FormatError, FormatNotSupportedError, NetworkError, AccessDeniedError };
- QMediaPlaylist(QObject *parent = 0);
+ explicit QMediaPlaylist(QObject *parent = Q_NULLPTR);
virtual ~QMediaPlaylist();
QMediaObject *mediaObject() const;
@@ -96,11 +96,11 @@ public:
bool removeMedia(int start, int end);
bool clear();
- void load(const QNetworkRequest &request, const char *format = 0);
- void load(const QUrl &location, const char *format = 0);
- void load(QIODevice * device, const char *format = 0);
+ void load(const QNetworkRequest &request, const char *format = Q_NULLPTR);
+ void load(const QUrl &location, const char *format = Q_NULLPTR);
+ void load(QIODevice *device, const char *format = Q_NULLPTR);
- bool save(const QUrl &location, const char *format = 0);
+ bool save(const QUrl &location, const char *format = Q_NULLPTR);
bool save(QIODevice * device, const char *format);
Error error() const;
diff --git a/src/multimedia/qmediacontrol.h b/src/multimedia/qmediacontrol.h
index 0f4c5d29..3c95444d 100644
--- a/src/multimedia/qmediacontrol.h
+++ b/src/multimedia/qmediacontrol.h
@@ -59,8 +59,8 @@ public:
~QMediaControl();
protected:
- QMediaControl(QObject *parent = 0);
- QMediaControl(QMediaControlPrivate &dd, QObject *parent = 0);
+ explicit QMediaControl(QObject *parent = Q_NULLPTR);
+ explicit QMediaControl(QMediaControlPrivate &dd, QObject *parent = Q_NULLPTR);
QMediaControlPrivate *d_ptr;
diff --git a/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h b/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h
index 2b2dcb6f..20188739 100644
--- a/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h
+++ b/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h
@@ -54,7 +54,7 @@
#include <QtCore/qglobal.h>
#ifndef QT_STATIC
-# if defined(QT_BUILD_QTMM_QUICK_LIB)
+# if defined(QT_BUILD_QTMULTIMEDIAQUICKTOOLS_LIB)
# define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_EXPORT
# else
# define Q_MULTIMEDIAQUICK_EXPORT Q_DECL_IMPORT
diff --git a/src/multimedia/radio/qradiodata.h b/src/multimedia/radio/qradiodata.h
index 40b03a72..a5cc0990 100644
--- a/src/multimedia/radio/qradiodata.h
+++ b/src/multimedia/radio/qradiodata.h
@@ -82,7 +82,7 @@ public:
College
};
- QRadioData(QMediaObject *mediaObject, QObject *parent = 0);
+ explicit QRadioData(QMediaObject *mediaObject, QObject *parent = Q_NULLPTR);
~QRadioData();
QMultimedia::AvailabilityStatus availability() const;
diff --git a/src/multimedia/radio/qradiotuner.h b/src/multimedia/radio/qradiotuner.h
index 8f917593..a9de6416 100644
--- a/src/multimedia/radio/qradiotuner.h
+++ b/src/multimedia/radio/qradiotuner.h
@@ -78,7 +78,7 @@ public:
enum StereoMode { ForceStereo, ForceMono, Auto };
enum SearchMode { SearchFast, SearchGetStationId };
- QRadioTuner(QObject *parent = 0);
+ explicit QRadioTuner(QObject *parent = Q_NULLPTR);
~QRadioTuner();
QMultimedia::AvailabilityStatus availability() const;
diff --git a/src/multimedia/recording/qaudiorecorder.h b/src/multimedia/recording/qaudiorecorder.h
index 34e58bbe..75f95d35 100644
--- a/src/multimedia/recording/qaudiorecorder.h
+++ b/src/multimedia/recording/qaudiorecorder.h
@@ -62,7 +62,7 @@ class Q_MULTIMEDIA_EXPORT QAudioRecorder : public QMediaRecorder
Q_OBJECT
Q_PROPERTY(QString audioInput READ audioInput WRITE setAudioInput NOTIFY audioInputChanged)
public:
- QAudioRecorder(QObject *parent = 0);
+ explicit QAudioRecorder(QObject *parent = Q_NULLPTR);
~QAudioRecorder();
QStringList audioInputs() const;
diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h
index a06c1ce7..3ac25129 100644
--- a/src/multimedia/recording/qmediarecorder.h
+++ b/src/multimedia/recording/qmediarecorder.h
@@ -106,7 +106,7 @@ public:
OutOfSpaceError
};
- QMediaRecorder(QMediaObject *mediaObject, QObject *parent = 0);
+ explicit QMediaRecorder(QMediaObject *mediaObject, QObject *parent = Q_NULLPTR);
~QMediaRecorder();
QMediaObject *mediaObject() const;
@@ -137,16 +137,16 @@ public:
QString audioCodecDescription(const QString &codecName) const;
QList<int> supportedAudioSampleRates(const QAudioEncoderSettings &settings = QAudioEncoderSettings(),
- bool *continuous = 0) const;
+ bool *continuous = Q_NULLPTR) const;
QStringList supportedVideoCodecs() const;
QString videoCodecDescription(const QString &codecName) const;
QList<QSize> supportedResolutions(const QVideoEncoderSettings &settings = QVideoEncoderSettings(),
- bool *continuous = 0) const;
+ bool *continuous = Q_NULLPTR) const;
QList<qreal> supportedFrameRates(const QVideoEncoderSettings &settings = QVideoEncoderSettings(),
- bool *continuous = 0) const;
+ bool *continuous = Q_NULLPTR) const;
QAudioEncoderSettings audioSettings() const;
QVideoEncoderSettings videoSettings() const;
@@ -193,7 +193,7 @@ Q_SIGNALS:
void availabilityChanged(QMultimedia::AvailabilityStatus availability);
protected:
- QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = 0);
+ QMediaRecorder(QMediaRecorderPrivate &dd, QMediaObject *mediaObject, QObject *parent = Q_NULLPTR);
bool setMediaObject(QMediaObject *object);
QMediaRecorderPrivate *d_ptr;
diff --git a/src/multimedia/video/qabstractvideofilter.h b/src/multimedia/video/qabstractvideofilter.h
index 266c1ea0..7e125fac 100644
--- a/src/multimedia/video/qabstractvideofilter.h
+++ b/src/multimedia/video/qabstractvideofilter.h
@@ -68,7 +68,7 @@ class Q_MULTIMEDIA_EXPORT QAbstractVideoFilter : public QObject
Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged)
public:
- explicit QAbstractVideoFilter(QObject *parent = 0);
+ explicit QAbstractVideoFilter(QObject *parent = Q_NULLPTR);
~QAbstractVideoFilter();
bool isActive() const;
diff --git a/src/multimedia/video/qabstractvideosurface.h b/src/multimedia/video/qabstractvideosurface.h
index cb367b19..f3d3e079 100644
--- a/src/multimedia/video/qabstractvideosurface.h
+++ b/src/multimedia/video/qabstractvideosurface.h
@@ -64,7 +64,7 @@ public:
ResourceError
};
- explicit QAbstractVideoSurface(QObject *parent = 0);
+ explicit QAbstractVideoSurface(QObject *parent = Q_NULLPTR);
~QAbstractVideoSurface();
virtual QList<QVideoFrame::PixelFormat> supportedPixelFormats(
diff --git a/src/multimedia/video/qvideoprobe.h b/src/multimedia/video/qvideoprobe.h
index 1bcc954d..854e7127 100644
--- a/src/multimedia/video/qvideoprobe.h
+++ b/src/multimedia/video/qvideoprobe.h
@@ -53,7 +53,7 @@ class Q_MULTIMEDIA_EXPORT QVideoProbe : public QObject
{
Q_OBJECT
public:
- explicit QVideoProbe(QObject *parent = 0);
+ explicit QVideoProbe(QObject *parent = Q_NULLPTR);
~QVideoProbe();
bool setSource(QMediaObject *source);
diff --git a/src/multimediawidgets/multimediawidgets.pro b/src/multimediawidgets/multimediawidgets.pro
index ec96be57..60321fba 100644
--- a/src/multimediawidgets/multimediawidgets.pro
+++ b/src/multimediawidgets/multimediawidgets.pro
@@ -7,8 +7,6 @@ qtHaveModule(opengl):!contains(QT_CONFIG, opengles1) {
DEFINES += QT_NO_OPENGL
}
-load(qt_module)
-
PRIVATE_HEADERS += \
qvideowidget_p.h \
qpaintervideosurface_p.h \
@@ -44,3 +42,5 @@ maemo6 {
}
HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
+
+load(qt_module)
diff --git a/src/multimediawidgets/qcameraviewfinder.h b/src/multimediawidgets/qcameraviewfinder.h
index 5be82017..2bd49fe8 100644
--- a/src/multimediawidgets/qcameraviewfinder.h
+++ b/src/multimediawidgets/qcameraviewfinder.h
@@ -61,7 +61,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QCameraViewfinder : public QVideoWidget
{
Q_OBJECT
public:
- QCameraViewfinder(QWidget *parent = 0);
+ explicit QCameraViewfinder(QWidget *parent = Q_NULLPTR);
~QCameraViewfinder();
QMediaObject *mediaObject() const;
diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h
index b6a76b9b..89de3397 100644
--- a/src/multimediawidgets/qgraphicsvideoitem.h
+++ b/src/multimediawidgets/qgraphicsvideoitem.h
@@ -63,7 +63,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QGraphicsVideoItem : public QGraphicsObject, pu
Q_PROPERTY(QSizeF size READ size WRITE setSize)
Q_PROPERTY(QSizeF nativeSize READ nativeSize NOTIFY nativeSizeChanged)
public:
- QGraphicsVideoItem(QGraphicsItem *parent = 0);
+ explicit QGraphicsVideoItem(QGraphicsItem *parent = Q_NULLPTR);
~QGraphicsVideoItem();
QMediaObject *mediaObject() const;
@@ -81,7 +81,7 @@ public:
QRectF boundingRect() const;
- void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
+ void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR);
Q_SIGNALS:
void nativeSizeChanged(const QSizeF &size);
diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h
index c52ffe57..9aca9d3a 100644
--- a/src/multimediawidgets/qvideowidget.h
+++ b/src/multimediawidgets/qvideowidget.h
@@ -64,7 +64,7 @@ class Q_MULTIMEDIAWIDGETS_EXPORT QVideoWidget : public QWidget, public QMediaBin
Q_PROPERTY(int saturation READ saturation WRITE setSaturation NOTIFY saturationChanged)
public:
- QVideoWidget(QWidget *parent = 0);
+ explicit QVideoWidget(QWidget *parent = Q_NULLPTR);
~QVideoWidget();
QMediaObject *mediaObject() const;
diff --git a/src/multimediawidgets/qvideowidgetcontrol.h b/src/multimediawidgets/qvideowidgetcontrol.h
index a3eedb25..7d942388 100644
--- a/src/multimediawidgets/qvideowidgetcontrol.h
+++ b/src/multimediawidgets/qvideowidgetcontrol.h
@@ -85,7 +85,7 @@ Q_SIGNALS:
void saturationChanged(int saturation);
protected:
- QVideoWidgetControl(QObject *parent = 0);
+ explicit QVideoWidgetControl(QObject *parent = Q_NULLPTR);
};
#define QVideoWidgetControl_iid "org.qt-project.qt.videowidgetcontrol/5.0"
diff --git a/src/plugins/alsa/alsa.pro b/src/plugins/alsa/alsa.pro
index 481c57ea..56657f10 100644
--- a/src/plugins/alsa/alsa.pro
+++ b/src/plugins/alsa/alsa.pro
@@ -1,10 +1,6 @@
TARGET = qtaudio_alsa
QT += multimedia-private
-PLUGIN_TYPE = audio
-PLUGIN_CLASS_NAME = QAlsaPlugin
-load(qt_plugin)
-
LIBS += -lasound
HEADERS += \
@@ -21,3 +17,7 @@ SOURCES += \
OTHER_FILES += \
alsa.json
+
+PLUGIN_TYPE = audio
+PLUGIN_CLASS_NAME = QAlsaPlugin
+load(qt_plugin)
diff --git a/src/plugins/android/src/src.pro b/src/plugins/android/src/src.pro
index 6a472a0a..166bcc42 100644
--- a/src/plugins/android/src/src.pro
+++ b/src/plugins/android/src/src.pro
@@ -1,9 +1,6 @@
TARGET = qtmedia_android
-QT += multimedia-private core-private network
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = QAndroidMediaServicePlugin
-load(qt_plugin)
+QT += multimedia-private core-private network
HEADERS += \
qandroidmediaserviceplugin.h
@@ -17,3 +14,7 @@ include (mediaplayer/mediaplayer.pri)
include (mediacapture/mediacapture.pri)
OTHER_FILES += android_mediaservice.json
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = QAndroidMediaServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/android/videonode/videonode.pro b/src/plugins/android/videonode/videonode.pro
index 661e3643..daf07c9e 100644
--- a/src/plugins/android/videonode/videonode.pro
+++ b/src/plugins/android/videonode/videonode.pro
@@ -1,10 +1,6 @@
TARGET = qtsgvideonode_android
-QT += quick multimedia-private qtmultimediaquicktools-private
-PLUGIN_TYPE = video/videonode
-PLUGIN_EXTENDS = quick
-PLUGIN_CLASS_NAME = QAndroidSGVideoNodeFactoryPlugin
-load(qt_plugin)
+QT += quick multimedia-private qtmultimediaquicktools-private
HEADERS += \
qandroidsgvideonodeplugin.h \
@@ -15,3 +11,8 @@ SOURCES += \
qandroidsgvideonode.cpp
OTHER_FILES += android_videonode.json
+
+PLUGIN_TYPE = video/videonode
+PLUGIN_EXTENDS = quick
+PLUGIN_CLASS_NAME = QAndroidSGVideoNodeFactoryPlugin
+load(qt_plugin)
diff --git a/src/plugins/audiocapture/audiocapture.pro b/src/plugins/audiocapture/audiocapture.pro
index 833e4b5f..ba2e5c80 100644
--- a/src/plugins/audiocapture/audiocapture.pro
+++ b/src/plugins/audiocapture/audiocapture.pro
@@ -1,10 +1,6 @@
TARGET = qtmedia_audioengine
QT += multimedia-private
-PLUGIN_TYPE=mediaservice
-PLUGIN_CLASS_NAME = AudioCaptureServicePlugin
-load(qt_plugin)
-
HEADERS += audioencodercontrol.h \
audiocontainercontrol.h \
audiomediarecordercontrol.h \
@@ -25,3 +21,7 @@ SOURCES += audioencodercontrol.cpp \
OTHER_FILES += \
audiocapture.json
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = AudioCaptureServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro
index a82d88de..8563eb65 100644
--- a/src/plugins/avfoundation/camera/camera.pro
+++ b/src/plugins/avfoundation/camera/camera.pro
@@ -1,13 +1,10 @@
+TARGET = qavfcamera
+
# Avoid clash with a variable named `slots' in a Quartz header
CONFIG += no_keywords
-TARGET = qavfcamera
QT += multimedia-private network
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = AVFServicePlugin
-load(qt_plugin)
-
LIBS += -framework AudioToolbox \
-framework CoreAudio \
-framework QuartzCore \
@@ -79,3 +76,7 @@ OBJECTIVE_SOURCES += avfcamerazoomcontrol.mm \
avfmediarecordercontrol_ios.mm
}
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = AVFServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
index 8b5f14b4..779d5ff2 100644
--- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
+++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro
@@ -1,16 +1,11 @@
-load(qt_build_config)
+TARGET = qavfmediaplayer
#DEFINES += QT_DEBUG_AVF
# Avoid clash with a variable named `slots' in a Quartz header
CONFIG += no_keywords
-TARGET = qavfmediaplayer
QT += multimedia-private network
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = AVFMediaPlayerServicePlugin
-load(qt_plugin)
-
LIBS += -framework AVFoundation -framework CoreMedia -framework CoreVideo -framework QuartzCore
DEFINES += QMEDIA_AVF_MEDIAPLAYER
@@ -75,3 +70,7 @@ ios|tvos {
OTHER_FILES += \
avfmediaplayer.json
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = AVFMediaPlayerServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/coreaudio/coreaudio.pro b/src/plugins/coreaudio/coreaudio.pro
index e01932c6..50159311 100644
--- a/src/plugins/coreaudio/coreaudio.pro
+++ b/src/plugins/coreaudio/coreaudio.pro
@@ -1,10 +1,6 @@
TARGET = qtaudio_coreaudio
QT += multimedia-private
-PLUGIN_TYPE = audio
-PLUGIN_CLASS_NAME = CoreAudioPlugin
-
-load(qt_plugin)
OTHER_FILES += \
coreaudio.json
@@ -37,3 +33,7 @@ ios|tvos {
LIBS += \
-framework CoreAudio \
-framework AudioToolbox
+
+PLUGIN_TYPE = audio
+PLUGIN_CLASS_NAME = CoreAudioPlugin
+load(qt_plugin)
diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro
index 4d718392..280b5261 100644
--- a/src/plugins/directshow/directshow.pro
+++ b/src/plugins/directshow/directshow.pro
@@ -2,9 +2,6 @@ TARGET = dsengine
win32:!qtHaveModule(opengl)|contains(QT_CONFIG,dynamicgl) {
LIBS_PRIVATE += -lgdi32 -luser32
}
-PLUGIN_TYPE=mediaservice
-PLUGIN_CLASS_NAME = DSServicePlugin
-load(qt_plugin)
QT += multimedia-private
@@ -21,3 +18,7 @@ include(camera/camera.pri)
OTHER_FILES += \
directshow.json \
directshow_camera.json
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = DSServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro
index 8cd1d587..4e816e92 100644
--- a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro
+++ b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro
@@ -1,9 +1,5 @@
TARGET = gstaudiodecoder
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = QGstreamerAudioDecoderServicePlugin
-load(qt_plugin)
-
include(../common.pri)
INCLUDEPATH += $$PWD
@@ -23,3 +19,6 @@ SOURCES += \
OTHER_FILES += \
audiodecoder.json
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = QGstreamerAudioDecoderServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro
index b807071f..214489f3 100644
--- a/src/plugins/gstreamer/camerabin/camerabin.pro
+++ b/src/plugins/gstreamer/camerabin/camerabin.pro
@@ -2,10 +2,6 @@ TARGET = gstcamerabin
QT += multimedia-private
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = CameraBinServicePlugin
-load(qt_plugin)
-
include(../common.pri)
INCLUDEPATH += $$PWD \
@@ -101,3 +97,7 @@ config_linux_v4l: {
OTHER_FILES += \
camerabin.json
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = CameraBinServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/gstreamer/common.pri b/src/plugins/gstreamer/common.pri
index eb6a2998..babdb7cf 100644
--- a/src/plugins/gstreamer/common.pri
+++ b/src/plugins/gstreamer/common.pri
@@ -1,6 +1,5 @@
QT += core-private multimedia-private network
-CONFIG += no_private_qt_headers_warning
qtHaveModule(widgets) {
QT += widgets multimediawidgets-private
diff --git a/src/plugins/gstreamer/mediacapture/mediacapture.pro b/src/plugins/gstreamer/mediacapture/mediacapture.pro
index 5baa0fd8..db5210d4 100644
--- a/src/plugins/gstreamer/mediacapture/mediacapture.pro
+++ b/src/plugins/gstreamer/mediacapture/mediacapture.pro
@@ -1,9 +1,5 @@
TARGET = gstmediacapture
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = QGstreamerCaptureServicePlugin
-load(qt_plugin)
-
include(../common.pri)
INCLUDEPATH += $$PWD
@@ -50,3 +46,7 @@ use_gstreamer_camera:config_linux_v4l {
OTHER_FILES += \
mediacapture.json
}
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = QGstreamerCaptureServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro
index b986fc78..5ccf89bf 100644
--- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro
+++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro
@@ -1,9 +1,5 @@
TARGET = gstmediaplayer
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = QGstreamerPlayerServicePlugin
-load(qt_plugin)
-
include(../common.pri)
INCLUDEPATH += $$PWD
@@ -28,3 +24,7 @@ SOURCES += \
OTHER_FILES += \
mediaplayer.json
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = QGstreamerPlayerServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/m3u/m3u.pro b/src/plugins/m3u/m3u.pro
index 3897e2de..d46911e0 100644
--- a/src/plugins/m3u/m3u.pro
+++ b/src/plugins/m3u/m3u.pro
@@ -1,12 +1,12 @@
TARGET = qtmultimedia_m3u
QT += multimedia-private
-PLUGIN_TYPE=playlistformats
-PLUGIN_CLASS_NAME = QM3uPlaylistPlugin
-load(qt_plugin)
-
HEADERS += qm3uhandler.h
SOURCES += qm3uhandler.cpp
OTHER_FILES += \
m3u.json
+
+PLUGIN_TYPE = playlistformats
+PLUGIN_CLASS_NAME = QM3uPlaylistPlugin
+load(qt_plugin)
diff --git a/src/plugins/opensles/opensles.pro b/src/plugins/opensles/opensles.pro
index aa8e0544..2bb0f3cf 100644
--- a/src/plugins/opensles/opensles.pro
+++ b/src/plugins/opensles/opensles.pro
@@ -1,10 +1,6 @@
TARGET = qtaudio_opensles
QT += multimedia-private core-private
-PLUGIN_TYPE = audio
-PLUGIN_CLASS_NAME = QOpenSLESPlugin
-load(qt_plugin)
-
LIBS += -lOpenSLES
HEADERS += \
@@ -23,3 +19,7 @@ SOURCES += \
OTHER_FILES += \
opensles.json
+
+PLUGIN_TYPE = audio
+PLUGIN_CLASS_NAME = QOpenSLESPlugin
+load(qt_plugin)
diff --git a/src/plugins/pulseaudio/pulseaudio.pro b/src/plugins/pulseaudio/pulseaudio.pro
index e8ab9317..7f4d3de2 100644
--- a/src/plugins/pulseaudio/pulseaudio.pro
+++ b/src/plugins/pulseaudio/pulseaudio.pro
@@ -1,10 +1,6 @@
TARGET = qtmedia_pulse
QT += multimedia-private
-PLUGIN_TYPE = audio
-PLUGIN_CLASS_NAME = QPulseAudioPlugin
-load(qt_plugin)
-
CONFIG += link_pkgconfig
PKGCONFIG += libpulse
@@ -24,3 +20,7 @@ SOURCES += qpulseaudioplugin.cpp \
OTHER_FILES += \
pulseaudio.json
+
+PLUGIN_TYPE = audio
+PLUGIN_CLASS_NAME = QPulseAudioPlugin
+load(qt_plugin)
diff --git a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp
index 6cc9329d..f905e69e 100644
--- a/src/plugins/pulseaudio/qaudiooutput_pulse.cpp
+++ b/src/plugins/pulseaudio/qaudiooutput_pulse.cpp
@@ -91,7 +91,6 @@ static void outputStreamUnderflowCallback(pa_stream *stream, void *userdata)
{
Q_UNUSED(stream)
((QPulseAudioOutput*)userdata)->streamUnderflowCallback();
- qWarning() << "Got a buffer underflow!";
}
static void outputStreamOverflowCallback(pa_stream *stream, void *userdata)
@@ -139,6 +138,18 @@ static void outputStreamDrainComplete(pa_stream *stream, int success, void *user
#endif
}
+static void streamAdjustPrebufferCallback(pa_stream *stream, int success, void *userdata)
+{
+ Q_UNUSED(stream);
+ Q_UNUSED(success);
+ Q_UNUSED(userdata);
+
+#ifdef DEBUG_PULSE
+ qDebug() << "Adjust prebuffer completed successfully: " << (bool)success;
+#endif
+}
+
+
QPulseAudioOutput::QPulseAudioOutput(const QByteArray &device)
: m_device(device)
, m_errorState(QAudio::NoError)
@@ -213,17 +224,19 @@ void QPulseAudioOutput::start(QIODevice *device)
// Handle change of mode
if (m_audioSource && !m_pullMode) {
delete m_audioSource;
- m_audioSource = 0;
}
+ m_audioSource = 0;
close();
- if (!open())
- return;
-
m_pullMode = true;
m_audioSource = device;
+ if (!open()) {
+ m_audioSource = 0;
+ return;
+ }
+
setState(QAudio::ActiveState);
}
@@ -235,17 +248,18 @@ QIODevice *QPulseAudioOutput::start()
// Handle change of mode
if (m_audioSource && !m_pullMode) {
delete m_audioSource;
- m_audioSource = 0;
}
+ m_audioSource = 0;
close();
+ m_pullMode = false;
+
if (!open())
return Q_NULLPTR;
m_audioSource = new PulseOutputPrivate(this);
m_audioSource->open(QIODevice::WriteOnly|QIODevice::Unbuffered);
- m_pullMode = false;
setState(QAudio::IdleState);
@@ -355,6 +369,17 @@ bool QPulseAudioOutput::open()
m_bufferSize = buffer->tlength;
m_maxBufferSize = buffer->maxlength;
m_audioBuffer = new char[m_maxBufferSize];
+
+ const qint64 streamSize = m_audioSource ? m_audioSource->size() : 0;
+ if (m_pullMode && streamSize > 0 && static_cast<qint64>(buffer->prebuf) > streamSize) {
+ pa_buffer_attr newBufferAttr;
+ newBufferAttr = *buffer;
+ newBufferAttr.prebuf = streamSize;
+ pa_operation *o = pa_stream_set_buffer_attr(m_stream, &newBufferAttr, streamAdjustPrebufferCallback, NULL);
+ if (o)
+ pa_operation_unref(o);
+ }
+
#ifdef DEBUG_PULSE
qDebug() << "Buffering info:";
qDebug() << "\tMax length: " << buffer->maxlength;
diff --git a/src/plugins/qnx-audio/audio/audio.pro b/src/plugins/qnx-audio/audio/audio.pro
index 35ddf73d..bd69dfe1 100644
--- a/src/plugins/qnx-audio/audio/audio.pro
+++ b/src/plugins/qnx-audio/audio/audio.pro
@@ -1,9 +1,6 @@
TARGET = qtmedia_qnx_audio
-QT += multimedia-private
-CONFIG += no_private_qt_headers_warning
-PLUGIN_TYPE = audio
-load(qt_plugin)
+QT += multimedia-private
LIBS += -lasound
@@ -20,3 +17,6 @@ SOURCES += qnxaudioplugin.cpp \
qnxaudioutils.cpp
OTHER_FILES += qnx_audio.json
+
+PLUGIN_TYPE = audio
+load(qt_plugin)
diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro
index f0156211..4d76fa5f 100644
--- a/src/plugins/qnx/qnx.pro
+++ b/src/plugins/qnx/qnx.pro
@@ -1,10 +1,6 @@
TARGET = qtmedia_qnx
QT += multimedia-private gui-private
-PLUGIN_TYPE=mediaservice
-PLUGIN_CLASS_NAME = BbServicePlugin
-load(qt_plugin)
-
LIBS += -lscreen
include(common/common.pri)
@@ -20,3 +16,7 @@ blackberry {
SOURCES += neutrinoserviceplugin.cpp
OTHER_FILES += neutrino_mediaservice.json
}
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = BbServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/resourcepolicy/resourcepolicy.pro b/src/plugins/resourcepolicy/resourcepolicy.pro
index 4805c525..91a94666 100644
--- a/src/plugins/resourcepolicy/resourcepolicy.pro
+++ b/src/plugins/resourcepolicy/resourcepolicy.pro
@@ -1,13 +1,9 @@
TARGET = resourceqt
QT += multimedia-private
-CONFIG += no_private_qt_headers_warning link_pkgconfig
+CONFIG += link_pkgconfig
PKGCONFIG += libresourceqt5
-PLUGIN_TYPE = resourcepolicy
-PLUGIN_CLASS_NAME = ResourceQtPolicyPlugin
-load(qt_plugin)
-
INCLUDEPATH += $$PWD \
$${SOURCE_DIR}/src/multimedia
@@ -21,3 +17,6 @@ SOURCES += \
$$PWD/resourcepolicyimpl.cpp \
$$PWD/resourcepolicyint.cpp
+PLUGIN_TYPE = resourcepolicy
+PLUGIN_CLASS_NAME = ResourceQtPolicyPlugin
+load(qt_plugin)
diff --git a/src/plugins/v4l/v4l.pro b/src/plugins/v4l/v4l.pro
index c5e95353..28d89e3e 100644
--- a/src/plugins/v4l/v4l.pro
+++ b/src/plugins/v4l/v4l.pro
@@ -1,11 +1,11 @@
TARGET = qtmedia_v4lengine
QT += multimedia-private
-PLUGIN_TYPE = mediaservice
-PLUGIN_CLASS_NAME = V4LServicePlugin
-load(qt_plugin)
-
HEADERS += v4lserviceplugin.h
SOURCES += v4lserviceplugin.cpp
include(radio/radio.pri)
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = V4LServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/videonode/egl/egl.pro b/src/plugins/videonode/egl/egl.pro
index a6256cea..7151123e 100644
--- a/src/plugins/videonode/egl/egl.pro
+++ b/src/plugins/videonode/egl/egl.pro
@@ -1,12 +1,8 @@
TARGET = eglvideonode
+
QT += multimedia-private qtmultimediaquicktools-private
CONFIG += egl
-PLUGIN_TYPE=video/videonode
-PLUGIN_EXTENDS = quick
-PLUGIN_CLASS_NAME = QSGVideoNodeFactory_EGL
-load(qt_plugin)
-
HEADERS += \
qsgvideonode_egl.h
@@ -15,3 +11,8 @@ SOURCES += \
OTHER_FILES += \
egl.json
+
+PLUGIN_TYPE = video/videonode
+PLUGIN_EXTENDS = quick
+PLUGIN_CLASS_NAME = QSGVideoNodeFactory_EGL
+load(qt_plugin)
diff --git a/src/plugins/videonode/imx6/imx6.pro b/src/plugins/videonode/imx6/imx6.pro
index 36e25e86..c8085a31 100644
--- a/src/plugins/videonode/imx6/imx6.pro
+++ b/src/plugins/videonode/imx6/imx6.pro
@@ -1,10 +1,6 @@
TARGET = imx6vivantevideonode
-QT += multimedia-private qtmultimediaquicktools-private
-PLUGIN_TYPE=video/videonode
-PLUGIN_EXTENDS = quick
-PLUGIN_CLASS_NAME = QSGVivanteVideoNodeFactory
-load(qt_plugin)
+QT += multimedia-private qtmultimediaquicktools-private
HEADERS += \
qsgvivantevideonode.h \
@@ -20,3 +16,8 @@ SOURCES += \
OTHER_FILES += \
imx6.json
+
+PLUGIN_TYPE = video/videonode
+PLUGIN_EXTENDS = quick
+PLUGIN_CLASS_NAME = QSGVivanteVideoNodeFactory
+load(qt_plugin)
diff --git a/src/plugins/windowsaudio/windowsaudio.pro b/src/plugins/windowsaudio/windowsaudio.pro
index 7e8e4320..ce64847d 100644
--- a/src/plugins/windowsaudio/windowsaudio.pro
+++ b/src/plugins/windowsaudio/windowsaudio.pro
@@ -1,10 +1,6 @@
TARGET = qtaudio_windows
QT += multimedia-private
-PLUGIN_TYPE = audio
-PLUGIN_CLASS_NAME = QWindowsAudioPlugin
-load(qt_plugin)
-
LIBS += -lstrmiids -lole32 -loleaut32
!wince*:LIBS += -lwinmm
@@ -24,3 +20,7 @@ SOURCES += \
OTHER_FILES += \
windowsaudio.json
+
+PLUGIN_TYPE = audio
+PLUGIN_CLASS_NAME = QWindowsAudioPlugin
+load(qt_plugin)
diff --git a/src/plugins/winrt/winrt.pro b/src/plugins/winrt/winrt.pro
index 2f87ea8f..87e44cce 100644
--- a/src/plugins/winrt/winrt.pro
+++ b/src/plugins/winrt/winrt.pro
@@ -1,10 +1,6 @@
TARGET = winrtengine
QT += multimedia-private
-PLUGIN_TYPE=mediaservice
-PLUGIN_CLASS_NAME = WinRTServicePlugin
-load(qt_plugin)
-
LIBS += -lmfplat -lmfuuid -loleaut32 -ld3d11 -lruntimeobject
HEADERS += \
@@ -43,3 +39,7 @@ SOURCES += \
OTHER_FILES += \
winrt.json
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = WinRTServicePlugin
+load(qt_plugin)
diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro
index 1f43bb12..e83c5159 100644
--- a/src/plugins/wmf/wmf.pro
+++ b/src/plugins/wmf/wmf.pro
@@ -5,10 +5,6 @@ win32:!qtHaveModule(opengl) {
LIBS_PRIVATE += -lgdi32 -luser32
}
-PLUGIN_TYPE=mediaservice
-PLUGIN_CLASS_NAME = WMFServicePlugin
-load(qt_plugin)
-
INCLUDEPATH += .
HEADERS += \
@@ -32,3 +28,7 @@ include (decoder/decoder.pri)
OTHER_FILES += \
wmf.json
+
+PLUGIN_TYPE = mediaservice
+PLUGIN_CLASS_NAME = WMFServicePlugin
+load(qt_plugin)
diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro
index b38f209e..e1425c3e 100644
--- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro
+++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro
@@ -1,11 +1,8 @@
TARGET = QtMultimediaQuick_p
+
QT = core quick multimedia-private
CONFIG += internal_module
-load(qt_module)
-
-DEFINES += QT_BUILD_QTMM_QUICK_LIB
-
# Header files must go inside source directory of a module
# to be installed by syncqt.
INCLUDEPATH += ../multimedia/qtmultimediaquicktools_headers/
@@ -47,3 +44,5 @@ OTHER_FILES += \
shaders/biplanaryuvvideo_swizzle.frag \
shaders/triplanaryuvvideo.vert \
shaders/triplanaryuvvideo.frag
+
+load(qt_module)
diff --git a/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro b/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
index 21204847..4534fb4f 100644
--- a/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
+++ b/tests/auto/unit/qaudiodecoder/qaudiodecoder.pro
@@ -1,14 +1,8 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2012-02-07T15:27:07
-#
-#-------------------------------------------------
-
QT += multimedia multimedia-private testlib gui
TARGET = tst_qaudiodecoder
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
TEMPLATE = app
diff --git a/tests/auto/unit/qaudioprobe/qaudioprobe.pro b/tests/auto/unit/qaudioprobe/qaudioprobe.pro
index 3d275b40..a83769cc 100644
--- a/tests/auto/unit/qaudioprobe/qaudioprobe.pro
+++ b/tests/auto/unit/qaudioprobe/qaudioprobe.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
TARGET = tst_qaudioprobe
QT += multimedia-private testlib
diff --git a/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro b/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro
index ccb5531e..a40fba23 100644
--- a/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro
+++ b/tests/auto/unit/qaudiorecorder/qaudiorecorder.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
TARGET = tst_qaudiorecorder
QT += multimedia-private testlib
diff --git a/tests/auto/unit/qmediaobject/qmediaobject.pro b/tests/auto/unit/qmediaobject/qmediaobject.pro
index 71a22ee6..26c9f122 100644
--- a/tests/auto/unit/qmediaobject/qmediaobject.pro
+++ b/tests/auto/unit/qmediaobject/qmediaobject.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
TARGET = tst_qmediaobject
QT += multimedia-private testlib
diff --git a/tests/auto/unit/qmediaplayer/qmediaplayer.pro b/tests/auto/unit/qmediaplayer/qmediaplayer.pro
index da52f081..7279239e 100644
--- a/tests/auto/unit/qmediaplayer/qmediaplayer.pro
+++ b/tests/auto/unit/qmediaplayer/qmediaplayer.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
TARGET = tst_qmediaplayer
QT += network multimedia-private testlib
SOURCES += tst_qmediaplayer.cpp
diff --git a/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro b/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro
index 97232f93..60c4f25f 100644
--- a/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro
+++ b/tests/auto/unit/qmediaplayerwidgets/qmediaplayerwidgets.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
TARGET = tst_qmediaplayerwidgets
QT += network multimedia-private multimediawidgets-private testlib widgets
SOURCES += tst_qmediaplayerwidgets.cpp
diff --git a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
index c43f6988..3a59823c 100644
--- a/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
+++ b/tests/auto/unit/qmediaplaylist/tst_qmediaplaylist.cpp
@@ -1218,7 +1218,7 @@ void tst_QMediaPlaylist::mediaPlayListControl()
{
// To check changes in abstract classe's pure virtual functions
QObject parent;
- MockMediaPlaylistControl plylistctrl(&parent);
+ MockMediaPlaylistControl plylistctrl(false, &parent);
}
// MaemoAPI-1850:test QMediaPlayListSourceControl constructor
diff --git a/tests/auto/unit/qmediarecorder/qmediarecorder.pro b/tests/auto/unit/qmediarecorder/qmediarecorder.pro
index 417ba17d..7103ea15 100644
--- a/tests/auto/unit/qmediarecorder/qmediarecorder.pro
+++ b/tests/auto/unit/qmediarecorder/qmediarecorder.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
TARGET = tst_qmediarecorder
QT += multimedia-private testlib
SOURCES += tst_qmediarecorder.cpp
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
index c17f5c3d..7fcaadbc 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
@@ -1,7 +1,12 @@
-TARGET = mockserviceplugin1
QT += multimedia-private
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin1.cpp
+OTHER_FILES += mockserviceplugin1.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
PLUGIN_CLASS_NAME = MockServicePlugin1
load(qt_plugin)
@@ -14,9 +19,4 @@ win32 {
}
}
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin1.cpp
-OTHER_FILES += mockserviceplugin1.json
-
target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
index 21c78790..4ac001ec 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
@@ -1,7 +1,12 @@
-TARGET = mockserviceplugin2
QT += multimedia-private
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin2.cpp
+OTHER_FILES += mockserviceplugin2.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
PLUGIN_CLASS_NAME = MockServicePlugin2
load(qt_plugin)
@@ -14,9 +19,4 @@ win32 {
}
}
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin2.cpp
-OTHER_FILES += mockserviceplugin2.json
-
target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
index 4e516a09..34cd2fed 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
@@ -1,7 +1,12 @@
-TARGET = mockserviceplugin3
QT += multimedia-private
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin3.cpp
+OTHER_FILES += mockserviceplugin3.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
PLUGIN_CLASS_NAME = MockServicePlugin3
load(qt_plugin)
@@ -14,9 +19,4 @@ win32 {
}
}
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin3.cpp
-OTHER_FILES += mockserviceplugin3.json
-
target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
index 3446e245..0900bfc4 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
@@ -1,7 +1,12 @@
-TARGET = mockserviceplugin4
QT += multimedia-private
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin4.cpp
+OTHER_FILES += mockserviceplugin4.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
PLUGIN_CLASS_NAME = MockServicePlugin4
load(qt_plugin)
@@ -14,9 +19,4 @@ win32 {
}
}
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin4.cpp
-OTHER_FILES += mockserviceplugin4.json
-
target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
index 2358fa50..37f287f9 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
@@ -1,7 +1,12 @@
-TARGET = mockserviceplugin5
QT += multimedia-private
-PLUGIN_TYPE=mediaservice
+HEADERS += ../mockservice.h
+SOURCES += mockserviceplugin5.cpp
+OTHER_FILES += mockserviceplugin5.json
+
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+PLUGIN_TYPE = mediaservice
PLUGIN_CLASS_NAME = MockServicePlugin5
load(qt_plugin)
@@ -14,9 +19,4 @@ win32 {
}
}
-HEADERS += ../mockservice.h
-SOURCES += mockserviceplugin5.cpp
-OTHER_FILES += mockserviceplugin5.json
-
target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
-
diff --git a/tests/auto/unit/qradiodata/qradiodata.pro b/tests/auto/unit/qradiodata/qradiodata.pro
index b8914c22..b08262d7 100644
--- a/tests/auto/unit/qradiodata/qradiodata.pro
+++ b/tests/auto/unit/qradiodata/qradiodata.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
TARGET = tst_qradiodata
QT += multimedia-private testlib
SOURCES += tst_qradiodata.cpp
diff --git a/tests/auto/unit/qradiotuner/qradiotuner.pro b/tests/auto/unit/qradiotuner/qradiotuner.pro
index 4298110d..d15c4c6a 100644
--- a/tests/auto/unit/qradiotuner/qradiotuner.pro
+++ b/tests/auto/unit/qradiotuner/qradiotuner.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
TARGET = tst_qradiotuner
QT += multimedia-private testlib
SOURCES += tst_qradiotuner.cpp
diff --git a/tests/auto/unit/qsamplecache/qsamplecache.pro b/tests/auto/unit/qsamplecache/qsamplecache.pro
index c17c1591..02ca7cb1 100644
--- a/tests/auto/unit/qsamplecache/qsamplecache.pro
+++ b/tests/auto/unit/qsamplecache/qsamplecache.pro
@@ -1,4 +1,4 @@
-CONFIG += no_private_qt_headers_warning testcase
+CONFIG += testcase
TARGET = tst_qsamplecache
QT += multimedia-private testlib
diff --git a/tests/auto/unit/qvideoprobe/qvideoprobe.pro b/tests/auto/unit/qvideoprobe/qvideoprobe.pro
index 03c7d56f..52fb9cde 100644
--- a/tests/auto/unit/qvideoprobe/qvideoprobe.pro
+++ b/tests/auto/unit/qvideoprobe/qvideoprobe.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase no_private_qt_headers_warning
+CONFIG += testcase
TARGET = tst_qvideoprobe
QT += multimedia-private testlib
diff --git a/tests/auto/unit/qwavedecoder/qwavedecoder.pro b/tests/auto/unit/qwavedecoder/qwavedecoder.pro
index 39ebaf63..1409df98 100644
--- a/tests/auto/unit/qwavedecoder/qwavedecoder.pro
+++ b/tests/auto/unit/qwavedecoder/qwavedecoder.pro
@@ -4,6 +4,6 @@ SOURCES += tst_qwavedecoder.cpp \
../../../../src/multimedia/audio/qwavedecoder_p.cpp
QT += multimedia-private testlib network
-CONFIG += no_private_qt_headers_warning testcase
+CONFIG += testcase
TESTDATA += data/*