diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2022-07-27 17:10:39 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-07-28 07:04:40 -0700 |
commit | 10c9145a126ea5b1980edf8dabee6c8be6becd34 (patch) | |
tree | ad8750efd7f95fd953ad9db3f9592b40985476c7 | |
parent | 7261e8625f7b2af25cd87740407743d503f594d1 (diff) | |
download | qtwayland-10c9145a126ea5b1980edf8dabee6c8be6becd34.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 }'
Pick-to: 6.4
Change-Id: I6f936da6f6e84d649f70fffd17058fd05cfc5c6d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r-- | src/client/qwaylanddisplay.cpp | 3 |
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" |