diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:43:04 +0200 |
| commit | c3ea9be0d49ec1eecda9d07e933d5426ed52670a (patch) | |
| tree | 2522225f27fdf1a139b167ea612a5bb016e4eb22 /src/multimedia/controls/qcameraimagecapturecontrol.h | |
| parent | 11eb454e7f53a5ddc81458b57afe2605c8fa5d4d (diff) | |
| parent | d32aff3e0453475c1a22d5e8c7a106df18c0ad10 (diff) | |
| download | qtmultimedia-c3ea9be0d49ec1eecda9d07e933d5426ed52670a.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ie1331c18854bea488c773807597f8ad209437657
Diffstat (limited to 'src/multimedia/controls/qcameraimagecapturecontrol.h')
| -rw-r--r-- | src/multimedia/controls/qcameraimagecapturecontrol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h index 94d4e2a7b..4fe7b9387 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" |