diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2019-09-11 14:18:27 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2019-09-11 15:52:47 +0200 |
| commit | ce560e8abcb13f5f9ddef0858b55199d144dadb5 (patch) | |
| tree | 0ec7473b7f952c4142f90f79931c14661d17ca53 | |
| parent | a1bf811b1dd287fbb75b6d27dbc163f15001e28f (diff) | |
Fix building with namespaced Qt
Change-Id: I690fa71f171b821098d33ce5482c9de467b645d5
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/multimedia/camera/qcameraimageprocessing.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/controls/qcameralockscontrol.cpp | 3 | ||||
| -rw-r--r-- | src/multimedia/controls/qradiotunercontrol.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp index c2cefeae7..27b7f05bd 100644 --- a/src/multimedia/camera/qcameraimageprocessing.cpp +++ b/src/multimedia/camera/qcameraimageprocessing.cpp @@ -400,6 +400,6 @@ bool QCameraImageProcessing::isColorFilterSupported(QCameraImageProcessing::Colo } +QT_END_NAMESPACE #include "moc_qcameraimageprocessing.cpp" -QT_END_NAMESPACE 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 diff --git a/src/multimedia/controls/qradiotunercontrol.cpp b/src/multimedia/controls/qradiotunercontrol.cpp index 8b9e865e1..ea2126319 100644 --- a/src/multimedia/controls/qradiotunercontrol.cpp +++ b/src/multimedia/controls/qradiotunercontrol.cpp @@ -339,6 +339,6 @@ QRadioTunerControl::~QRadioTunerControl() reflected with the \a connectionStatus. */ -#include "moc_qradiotunercontrol.cpp" QT_END_NAMESPACE +#include "moc_qradiotunercontrol.cpp" |