summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2022-07-27 17:10:39 -0700
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-07-28 14:21:02 +0000
commit1a21b9995433be54b55e603a4889482bfe71b87c (patch)
treea0f0c7aad138985e0ac93be52917372980008dce
parentf840cef3ae61740580e811bac60bed263fd18b6c (diff)
downloadqtwayland-1a21b9995433be54b55e603a4889482bfe71b87c.tar.gz
Fix several more improperly placed #include moc
Like commit qtbase/638893bea083b619b73b33a7dd5589fb2c4c4242. Script to find them: git grep -l '#include.*moc' \*.cpp \*.mm | \ xargs awk '/QT_BEGIN_NAMESPACE/ { i=1 } /QT_END_NAMESPACE/ { i=0 } /#include.*moc/ && i { print ARGV[ARGIND], $0 }' Change-Id: I6f936da6f6e84d649f70fffd17058fd05cfc5c6d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 10c9145a126ea5b1980edf8dabee6c8be6becd34) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/client/qwaylanddisplay.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index 55043311..2d82f447 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -878,8 +878,7 @@ QWaylandCursorTheme *QWaylandDisplay::loadCursorTheme(const QString &name, int p
} // namespace QtWaylandClient
-#include "qwaylanddisplay.moc"
-
QT_END_NAMESPACE
+#include "qwaylanddisplay.moc"
#include "moc_qwaylanddisplay_p.cpp"