From 49727764f7f379496f809978968cf4ffcc922b39 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 19 Jun 2022 12:06:26 -0700 Subject: [PATCH] Fix improper moc includes inside the Qt namespace Change-Id: Id0fb9ab0089845ee8843fffd16fa1b1413fd0d41 Reviewed-by: Volker Hilsheimer (cherry picked from commit 23bf260f10f4b507e2e19398a16574ca77fe774d) Reviewed-by: Qt Cherry-pick Bot --- src/gui/kernel/qguiapplication.cpp | 4 ++-- src/gui/kernel/qopenglcontext.cpp | 4 ++-- src/widgets/graphicsview/qgraphicstransform.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 469f5c41a70..dbe50aee82e 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -4268,6 +4268,6 @@ void *QGuiApplication::resolveInterface(const char *name, int revision) const return QCoreApplication::resolveInterface(name, revision); } -#include "moc_qguiapplication.cpp" - QT_END_NAMESPACE + +#include "moc_qguiapplication.cpp" diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index 4e6bd67c82d..5849c7318e2 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -1299,6 +1299,6 @@ void *QOpenGLContext::resolveInterface(const char *name, int revision) const return nullptr; } -#include "moc_qopenglcontext.cpp" - QT_END_NAMESPACE + +#include "moc_qopenglcontext.cpp" diff --git a/src/widgets/graphicsview/qgraphicstransform.cpp b/src/widgets/graphicsview/qgraphicstransform.cpp index a95b33f04b2..172bdff0818 100644 --- a/src/widgets/graphicsview/qgraphicstransform.cpp +++ b/src/widgets/graphicsview/qgraphicstransform.cpp @@ -557,6 +557,6 @@ void QGraphicsRotation::applyTo(QMatrix4x4 *matrix) const \sa QGraphicsRotation::axis */ -#include "moc_qgraphicstransform.cpp" - QT_END_NAMESPACE + +#include "moc_qgraphicstransform.cpp"