diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:17:53 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:17:53 +0100 |
commit | 06a9505327f1c8aee70d701037b2cdcc4fc143f6 (patch) | |
tree | 242cec89d49078e912343afa8fc1ff92c7a8c2db /src/multimedia/controls/qcameraviewfindersettingscontrol.h | |
parent | 9500aadc219481d89d32e5c2a2de10b0740c50de (diff) | |
parent | 3198bf4944edd8f25996c2b4c4516f606165af59 (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
Diffstat (limited to 'src/multimedia/controls/qcameraviewfindersettingscontrol.h')
-rw-r--r-- | src/multimedia/controls/qcameraviewfindersettingscontrol.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.h b/src/multimedia/controls/qcameraviewfindersettingscontrol.h index aa3dd913e..c67fdaabb 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" |