From ce560e8abcb13f5f9ddef0858b55199d144dadb5 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 11 Sep 2019 14:18:27 +0200 Subject: Fix building with namespaced Qt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I690fa71f171b821098d33ce5482c9de467b645d5 Reviewed-by: Jörg Bornemann --- src/multimedia/camera/qcameraimageprocessing.cpp | 2 +- src/multimedia/controls/qcameralockscontrol.cpp | 3 +-- src/multimedia/controls/qradiotunercontrol.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/multimedia') 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" -- cgit v1.2.3