diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-11 18:48:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 08:50:11 +0000 |
| commit | 324471ef9054911422f8f2d40a243c67b501c8f0 (patch) | |
| tree | b6fccceb55f338a8c53e31afb88a4fce965d305b /src/multimedia/camera | |
| parent | c9058d90d0b08781f14a494780c3094594c81f22 (diff) | |
| parent | a1bf811b1dd287fbb75b6d27dbc163f15001e28f (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/gsttools/qgstvideorenderersink.cpp
src/gsttools/qgstvideorenderersink_p.h
Change-Id: I7fe29161d568fa3f7688abfd2f993d1b16ac3fb9
Diffstat (limited to 'src/multimedia/camera')
| -rw-r--r-- | src/multimedia/camera/qcameraexposure.cpp | 3 | ||||
| -rw-r--r-- | src/multimedia/camera/qcamerafocus.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/camera/qcameraimagecapture.cpp | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/multimedia/camera/qcameraexposure.cpp b/src/multimedia/camera/qcameraexposure.cpp index 91950c7d2..022dea28c 100644 --- a/src/multimedia/camera/qcameraexposure.cpp +++ b/src/multimedia/camera/qcameraexposure.cpp @@ -702,5 +702,6 @@ void QCameraExposure::setAutoShutterSpeed() Signal emitted when the exposure compensation changes to \a value. */ -#include "moc_qcameraexposure.cpp" QT_END_NAMESPACE + +#include "moc_qcameraexposure.cpp" diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp index 775e49b63..980b9dc93 100644 --- a/src/multimedia/camera/qcamerafocus.cpp +++ b/src/multimedia/camera/qcamerafocus.cpp @@ -609,6 +609,6 @@ void QCameraFocus::zoomTo(qreal optical, qreal digital) have been detected. */ +QT_END_NAMESPACE #include "moc_qcamerafocus.cpp" -QT_END_NAMESPACE diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp index 8f364a686..502812f76 100644 --- a/src/multimedia/camera/qcameraimagecapture.cpp +++ b/src/multimedia/camera/qcameraimagecapture.cpp @@ -643,7 +643,6 @@ void QCameraImageCapture::cancelCapture() Signal emitted when the frame with request \a id was saved to \a fileName. */ - -#include "moc_qcameraimagecapture.cpp" QT_END_NAMESPACE +#include "moc_qcameraimagecapture.cpp" |