diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 03:04:00 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-21 03:04:00 +0200 |
| commit | a60135c887aacdae071c3d9a316c7898d6469943 (patch) | |
| tree | a588dcef8883310b738169ac05ed31c8048f9fdb /src/multimedia/camera | |
| parent | 38e49d060d13ef592f457a5d6640d68a2d9c6b06 (diff) | |
| parent | 43cd99e688860112aa0dce06e1adb7bde4a06edc (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I2ba97d82a57172656f6549f368ee51f718f9cdf8
Diffstat (limited to 'src/multimedia/camera')
| -rw-r--r-- | src/multimedia/camera/qcameraimageprocessing.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp index 0328f4a56..af6c22391 100644 --- a/src/multimedia/camera/qcameraimageprocessing.cpp +++ b/src/multimedia/camera/qcameraimageprocessing.cpp @@ -396,6 +396,6 @@ bool QCameraImageProcessing::isColorFilterSupported(QCameraImageProcessing::Colo } +QT_END_NAMESPACE #include "moc_qcameraimageprocessing.cpp" -QT_END_NAMESPACE |