diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-28 03:03:25 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-28 03:03:31 +0200 |
| commit | 6ce358e2b11fc8b160840a811bdced3643948a56 (patch) | |
| tree | 951ce7953ad6a208f6f622e08d89db32d5309c3e /src/multimedia/controls/qcameralockscontrol.cpp | |
| parent | d5babf5976fcf86af6cbbf2c5e354767d1f4c612 (diff) | |
| parent | aa6abc4f262c7e3623df34810d6abdf810a8f047 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/multimedia/controls/qcameralockscontrol.cpp')
| -rw-r--r-- | src/multimedia/controls/qcameralockscontrol.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/multimedia/controls/qcameralockscontrol.cpp b/src/multimedia/controls/qcameralockscontrol.cpp index d8d6e61cd..436b3b9c9 100644 --- a/src/multimedia/controls/qcameralockscontrol.cpp +++ b/src/multimedia/controls/qcameralockscontrol.cpp @@ -122,7 +122,6 @@ QCameraLocksControl::~QCameraLocksControl() Signals the lock \a type \a status was changed with the specified \a reason. */ - +QT_END_NAMESPACE #include "moc_qcameralockscontrol.cpp" -QT_END_NAMESPACE |