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 ca32751f05a101905410f758a22d80d5a8337346)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

12 files changed, 26 insertions, 28 deletions

diff --git a/src/labs/folderlistmodel/qquickfolderlistmodel.cpp b/src/labs/folderlistmodel/qquickfolderlistmodel.cpp
index af282bf04b..c1070e3f4f 100644
--- a/src/labs/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/labs/folderlistmodel/qquickfolderlistmodel.cpp
@@ -885,7 +885,7 @@ int QQuickFolderListModel::indexOf(const QUrl &file) const
     return d->data.indexOf(toFind);
 }
 
-#include "moc_qquickfolderlistmodel_p.cpp"
-
 //![code]
 QT_END_NAMESPACE
+
+#include "moc_qquickfolderlistmodel_p.cpp"
diff --git a/src/qml/jsruntime/qv4promiseobject.cpp b/src/qml/jsruntime/qv4promiseobject.cpp
index 6beacd65bc..5424545e79 100644
--- a/src/qml/jsruntime/qv4promiseobject.cpp
+++ b/src/qml/jsruntime/qv4promiseobject.cpp
@@ -80,8 +80,6 @@ struct ResolveThenableEvent : public QEvent
 } // namespace Promise
 } // namespace QV4
 
-#include "moc_qv4promiseobject_p.cpp"
-
 ReactionHandler::ReactionHandler(QObject *parent)
     : QObject(parent)
 {}
@@ -1062,3 +1060,5 @@ ReturnedValue RejectWrapper::virtualCall(const FunctionObject *f, const Value *t
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qv4promiseobject_p.cpp"
diff --git a/src/quick/items/qquickframebufferobject.cpp b/src/quick/items/qquickframebufferobject.cpp
index 3741aede55..0633d01ce4 100644
--- a/src/quick/items/qquickframebufferobject.cpp
+++ b/src/quick/items/qquickframebufferobject.cpp
@@ -513,7 +513,7 @@ void QQuickFramebufferObject::Renderer::update()
         ((QSGFramebufferObjectNode *) data)->scheduleRender();
 }
 
+QT_END_NAMESPACE
+
 #include "qquickframebufferobject.moc"
 #include "moc_qquickframebufferobject.cpp"
-
-QT_END_NAMESPACE
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index a772d708a8..7bb21a6d9d 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -1016,6 +1016,6 @@ void QQuickLoaderPrivate::createComponent()
     qmlWarning(q) << "createComponent: Cannot find a QML engine.";
 }
 
-#include <moc_qquickloader_p.cpp>
-
 QT_END_NAMESPACE
+
+#include <moc_qquickloader_p.cpp>
diff --git a/src/quick/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp
index 55ce238bc0..b3c9f67cc6 100644
--- a/src/quick/items/qquickshadereffectsource.cpp
+++ b/src/quick/items/qquickshadereffectsource.cpp
@@ -769,7 +769,7 @@ void QQuickShaderEffectSource::itemChange(ItemChange change, const ItemChangeDat
     QQuickItem::itemChange(change, value);
 }
 
+QT_END_NAMESPACE
+
 #include "qquickshadereffectsource.moc"
 #include "moc_qquickshadereffectsource_p.cpp"
-
-QT_END_NAMESPACE
diff --git a/src/quick/items/qquicktableview.cpp b/src/quick/items/qquicktableview.cpp
index 1bda2893ca..14b2cc1164 100644
--- a/src/quick/items/qquicktableview.cpp
+++ b/src/quick/items/qquicktableview.cpp
@@ -5132,8 +5132,8 @@ QQuickTableSectionSizeProviderPrivate::~QQuickTableSectionSizeProviderPrivate()
 {
 
 }
-#include "moc_qquicktableview_p.cpp"
 
 QT_END_NAMESPACE
 
+#include "moc_qquicktableview_p.cpp"
 #include "moc_qquicktableview_p_p.cpp"
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index d44c019133..2026d41fdf 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -129,10 +129,6 @@ private:
     int m_timer;
 };
 
-#include "qquickwindow.moc"
-#include "moc_qquickwindow_p.cpp"
-
-
 #if QT_CONFIG(accessibility)
 /*!
     Returns an accessibility interface for this window, or 0 if such an
@@ -4177,6 +4173,8 @@ QDebug operator<<(QDebug debug, const QQuickWindow *win)
 }
 #endif
 
-#include "moc_qquickwindow.cpp"
-
 QT_END_NAMESPACE
+
+#include "qquickwindow.moc"
+#include "moc_qquickwindow_p.cpp"
+#include "moc_qquickwindow.cpp"
diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp
index cf54d81670..fa709deea2 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarethreadedrenderloop.cpp
@@ -981,7 +981,7 @@ void QSGSoftwareThreadedRenderLoop::polishAndSync(QSGSoftwareThreadedRenderLoop:
                            QQuickProfiler::SceneGraphPolishAndSyncAnimations);
 }
 
+QT_END_NAMESPACE
+
 #include "qsgsoftwarethreadedrenderloop.moc"
 #include "moc_qsgsoftwarethreadedrenderloop_p.cpp"
-
-QT_END_NAMESPACE
diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index b33ba55907..f56e9898c6 100644
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -437,7 +437,7 @@ QSGTexture *QSGRenderContext::compressedTextureForFactory(const QSGCompressedTex
     return nullptr;
 }
 
+QT_END_NAMESPACE
+
 #include "qsgcontext.moc"
 #include "moc_qsgcontext_p.cpp"
-
-QT_END_NAMESPACE
diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index 9182f3e28a..5545ea05d9 100644
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -781,7 +781,7 @@ void QSGGuiThreadRenderLoop::handleUpdateRequest(QQuickWindow *window)
 
 #endif // ENABLE_DEFAULT_BACKEND
 
+QT_END_NAMESPACE
+
 #include "qsgrenderloop.moc"
 #include "moc_qsgrenderloop_p.cpp"
-
-QT_END_NAMESPACE
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index 244f0fbcdc..e20ded6c5a 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -1714,7 +1714,7 @@ void QSGThreadedRenderLoop::postJob(QQuickWindow *window, QRunnable *job)
         delete job;
 }
 
+QT_END_NAMESPACE
+
 #include "qsgthreadedrenderloop.moc"
 #include "moc_qsgthreadedrenderloop_p.cpp"
-
-QT_END_NAMESPACE
diff --git a/src/quick/util/qquickprofiler.cpp b/src/quick/util/qquickprofiler.cpp
index 7742566e4d..6e3dc4ac15 100644
--- a/src/quick/util/qquickprofiler.cpp
+++ b/src/quick/util/qquickprofiler.cpp
@@ -42,9 +42,6 @@ public:
     }
 };
 
-#include "qquickprofiler.moc"
-#include "moc_qquickprofiler_p.cpp"
-
 QQuickProfiler::QQuickProfiler(QObject *parent) : QObject(parent)
 {
     // This is safe because at this point the m_instance isn't initialized, yet.
@@ -94,3 +91,6 @@ void QQuickProfiler::setTimer(const QElapsedTimer &t)
 }
 
 QT_END_NAMESPACE
+
+#include "qquickprofiler.moc"
+#include "moc_qquickprofiler_p.cpp"