diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-06-19 12:06:26 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-06-19 21:32:48 -0700 |
| commit | 23bf260f10f4b507e2e19398a16574ca77fe774d (patch) | |
| tree | 479fd3d532aef2b1c6e80c8520b7ae1f2228df00 /src | |
| parent | ea4d6b987ae10f1bb910081b523c3b22b11f7b64 (diff) | |
Fix improper moc includes inside the Qt namespace
Pick-to: 6.3 6.4
Change-Id: Id0fb9ab0089845ee8843fffd16fa1b1413fd0d41
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qopenglcontext.cpp | 4 | ||||
| -rw-r--r-- | 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 469f5c41a7..dbe50aee82 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 4e6bd67c82..5849c7318e 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 a95b33f04b..172bdff081 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" |