From 1a21b9995433be54b55e603a4889482bfe71b87c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 27 Jul 2022 17:10:39 -0700 Subject: 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 Reviewed-by: Volker Hilsheimer (cherry picked from commit 10c9145a126ea5b1980edf8dabee6c8be6becd34) Reviewed-by: Qt Cherry-pick Bot --- src/client/qwaylanddisplay.cpp | 3 +-- 1 file changed, 1 insertion(+), 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" -- cgit v1.2.1