Merge remote-tracking branch 'origin/tqtc/lts-6.2.6' into tqtc/lts-6.2-opensource

Change-Id: I1754d328b03502c4e0c319bad5ed1b56577447c7

282 files changed, 571 insertions, 39 deletions

diff --git a/.cmake.conf b/.cmake.conf
index 940e347ad..6f32ba4d5 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.2.5")
+set(QT_REPO_MODULE_VERSION "6.2.6")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "")
diff --git a/.qmake.conf b/.qmake.conf
index fa450db3e..ccdc89489 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -6,4 +6,4 @@ load(qt_build_config)
 DEFINES += QT_NO_FOREACH
 DEFINES += QT_NO_JAVA_STYLE_ITERATORS
 
-MODULE_VERSION = 6.2.5
+MODULE_VERSION = 6.2.6
diff --git a/src/animation/frontend/qabstractanimation.cpp b/src/animation/frontend/qabstractanimation.cpp
index 4eee6ebac..0c04780c1 100644
--- a/src/animation/frontend/qabstractanimation.cpp
+++ b/src/animation/frontend/qabstractanimation.cpp
@@ -190,3 +190,5 @@ void QAbstractAnimation::setDuration(float duration)
 } // Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qabstractanimation.cpp"
diff --git a/src/animation/frontend/qabstractanimationclip.cpp b/src/animation/frontend/qabstractanimationclip.cpp
index 27618cd7e..98bd45324 100644
--- a/src/animation/frontend/qabstractanimationclip.cpp
+++ b/src/animation/frontend/qabstractanimationclip.cpp
@@ -158,3 +158,5 @@ float QAbstractAnimationClip::duration() const
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qabstractanimationclip.cpp"
diff --git a/src/animation/frontend/qabstractchannelmapping.cpp b/src/animation/frontend/qabstractchannelmapping.cpp
index e1ea7f047..3e5e6a9fa 100644
--- a/src/animation/frontend/qabstractchannelmapping.cpp
+++ b/src/animation/frontend/qabstractchannelmapping.cpp
@@ -68,3 +68,5 @@ QAbstractChannelMapping::~QAbstractChannelMapping()
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qabstractchannelmapping.cpp"
diff --git a/src/animation/frontend/qabstractclipanimator.cpp b/src/animation/frontend/qabstractclipanimator.cpp
index cb4621182..6f3baa634 100644
--- a/src/animation/frontend/qabstractclipanimator.cpp
+++ b/src/animation/frontend/qabstractclipanimator.cpp
@@ -337,3 +337,5 @@ void QAbstractClipAnimator::stop()
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qabstractclipanimator.cpp"
diff --git a/src/animation/frontend/qabstractclipblendnode.cpp b/src/animation/frontend/qabstractclipblendnode.cpp
index de5084b35..ae03c3197 100644
--- a/src/animation/frontend/qabstractclipblendnode.cpp
+++ b/src/animation/frontend/qabstractclipblendnode.cpp
@@ -137,3 +137,5 @@ QAbstractClipBlendNode::~QAbstractClipBlendNode()
 } // Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qabstractclipblendnode.cpp"
diff --git a/src/animation/frontend/qadditiveclipblend.cpp b/src/animation/frontend/qadditiveclipblend.cpp
index ca49beb32..ceb2073e7 100644
--- a/src/animation/frontend/qadditiveclipblend.cpp
+++ b/src/animation/frontend/qadditiveclipblend.cpp
@@ -243,3 +243,5 @@ void QAdditiveClipBlend::setAdditiveClip(QAbstractClipBlendNode *additiveClip)
 } // Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qadditiveclipblend.cpp"
diff --git a/src/animation/frontend/qanimationaspect.cpp b/src/animation/frontend/qanimationaspect.cpp
index 351569190..d5d079bb1 100644
--- a/src/animation/frontend/qanimationaspect.cpp
+++ b/src/animation/frontend/qanimationaspect.cpp
@@ -150,3 +150,5 @@ std::vector<QAspectJobPtr> QAnimationAspect::jobsToExecute(qint64 time)
 QT_END_NAMESPACE
 
 QT3D_REGISTER_NAMESPACED_ASPECT("animation", QT_PREPEND_NAMESPACE(Qt3DAnimation), QAnimationAspect)
+
+#include "moc_qanimationaspect.cpp"
diff --git a/src/animation/frontend/qanimationclip.cpp b/src/animation/frontend/qanimationclip.cpp
index 8dfbf2a1f..9f15e3474 100644
--- a/src/animation/frontend/qanimationclip.cpp
+++ b/src/animation/frontend/qanimationclip.cpp
@@ -95,3 +95,5 @@ void QAnimationClip::setClipData(const Qt3DAnimation::QAnimationClipData &clipDa
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qanimationclip.cpp"
diff --git a/src/animation/frontend/qanimationcliploader.cpp b/src/animation/frontend/qanimationcliploader.cpp
index 25cb7253d..b2f4dcd8e 100644
--- a/src/animation/frontend/qanimationcliploader.cpp
+++ b/src/animation/frontend/qanimationcliploader.cpp
@@ -147,3 +147,5 @@ void QAnimationClipLoader::setSource(const QUrl &source)
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qanimationcliploader.cpp"
diff --git a/src/animation/frontend/qanimationcontroller.cpp b/src/animation/frontend/qanimationcontroller.cpp
index fef8ad084..98a6a751d 100644
--- a/src/animation/frontend/qanimationcontroller.cpp
+++ b/src/animation/frontend/qanimationcontroller.cpp
@@ -391,3 +391,5 @@ QAnimationGroup *QAnimationController::getGroup(int index) const
 } // Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qanimationcontroller.cpp"
diff --git a/src/animation/frontend/qanimationgroup.cpp b/src/animation/frontend/qanimationgroup.cpp
index 6c669106e..24ac1b396 100644
--- a/src/animation/frontend/qanimationgroup.cpp
+++ b/src/animation/frontend/qanimationgroup.cpp
@@ -213,3 +213,5 @@ void QAnimationGroup::setPosition(float position)
 } // Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qanimationgroup.cpp"
diff --git a/src/animation/frontend/qblendedclipanimator.cpp b/src/animation/frontend/qblendedclipanimator.cpp
index e6c5caead..02d9981fc 100644
--- a/src/animation/frontend/qblendedclipanimator.cpp
+++ b/src/animation/frontend/qblendedclipanimator.cpp
@@ -309,3 +309,5 @@ void QBlendedClipAnimator::setBlendTree(QAbstractClipBlendNode *blendTree)
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qblendedclipanimator.cpp"
diff --git a/src/animation/frontend/qcallbackmapping.cpp b/src/animation/frontend/qcallbackmapping.cpp
index 972ae73aa..af765378e 100644
--- a/src/animation/frontend/qcallbackmapping.cpp
+++ b/src/animation/frontend/qcallbackmapping.cpp
@@ -144,3 +144,5 @@ void QCallbackMapping::setCallback(int type, QAnimationCallback *callback, QAnim
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qcallbackmapping.cpp"
diff --git a/src/animation/frontend/qchannelmapper.cpp b/src/animation/frontend/qchannelmapper.cpp
index 334208238..1ad88941c 100644
--- a/src/animation/frontend/qchannelmapper.cpp
+++ b/src/animation/frontend/qchannelmapper.cpp
@@ -112,3 +112,5 @@ QList<QAbstractChannelMapping *> QChannelMapper::mappings() const
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qchannelmapper.cpp"
diff --git a/src/animation/frontend/qchannelmapping.cpp b/src/animation/frontend/qchannelmapping.cpp
index c2c6ade38..340cf309f 100644
--- a/src/animation/frontend/qchannelmapping.cpp
+++ b/src/animation/frontend/qchannelmapping.cpp
@@ -252,3 +252,5 @@ void QChannelMapping::setProperty(const QString &property)
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qchannelmapping.cpp"
diff --git a/src/animation/frontend/qclipanimator.cpp b/src/animation/frontend/qclipanimator.cpp
index 1f1d05a1b..f511b526e 100644
--- a/src/animation/frontend/qclipanimator.cpp
+++ b/src/animation/frontend/qclipanimator.cpp
@@ -166,3 +166,5 @@ void QClipAnimator::setClip(QAbstractAnimationClip *clip)
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qclipanimator.cpp"
diff --git a/src/animation/frontend/qclipblendvalue.cpp b/src/animation/frontend/qclipblendvalue.cpp
index e7e8a8898..0f6e0207c 100644
--- a/src/animation/frontend/qclipblendvalue.cpp
+++ b/src/animation/frontend/qclipblendvalue.cpp
@@ -122,3 +122,5 @@ void QClipBlendValue::setClip(Qt3DAnimation::QAbstractAnimationClip *clip)
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qclipblendvalue.cpp"
diff --git a/src/animation/frontend/qclock.cpp b/src/animation/frontend/qclock.cpp
index 5f9214419..0fa792158 100644
--- a/src/animation/frontend/qclock.cpp
+++ b/src/animation/frontend/qclock.cpp
@@ -90,3 +90,5 @@ void QClock::setPlaybackRate(double playbackRate)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qclock.cpp"
diff --git a/src/animation/frontend/qkeyframeanimation.cpp b/src/animation/frontend/qkeyframeanimation.cpp
index 08bd584f2..4f208de4d 100644
--- a/src/animation/frontend/qkeyframeanimation.cpp
+++ b/src/animation/frontend/qkeyframeanimation.cpp
@@ -416,3 +416,5 @@ Qt3DCore::QTransform *QKeyframeAnimation::target() const
 } // Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qkeyframeanimation.cpp"
diff --git a/src/animation/frontend/qlerpclipblend.cpp b/src/animation/frontend/qlerpclipblend.cpp
index 9ee95ccdb..891c6433e 100644
--- a/src/animation/frontend/qlerpclipblend.cpp
+++ b/src/animation/frontend/qlerpclipblend.cpp
@@ -218,3 +218,5 @@ void QLerpClipBlend::setEndClip(Qt3DAnimation::QAbstractClipBlendNode *endClip)
 } // Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qlerpclipblend.cpp"
diff --git a/src/animation/frontend/qmorphinganimation.cpp b/src/animation/frontend/qmorphinganimation.cpp
index df7b7b209..622f86eb1 100644
--- a/src/animation/frontend/qmorphinganimation.cpp
+++ b/src/animation/frontend/qmorphinganimation.cpp
@@ -454,3 +454,5 @@ void QMorphingAnimation::updateAnimation(float position)
 } // Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qmorphinganimation.cpp"
diff --git a/src/animation/frontend/qmorphtarget.cpp b/src/animation/frontend/qmorphtarget.cpp
index 1108bf45b..61386b77a 100644
--- a/src/animation/frontend/qmorphtarget.cpp
+++ b/src/animation/frontend/qmorphtarget.cpp
@@ -190,3 +190,5 @@ QMorphTarget *QMorphTarget::fromGeometry(Qt3DCore::QGeometry *geometry, const QS
 } // Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qmorphtarget.cpp"
diff --git a/src/animation/frontend/qskeletonmapping.cpp b/src/animation/frontend/qskeletonmapping.cpp
index e13cd87ec..90c5ddea9 100644
--- a/src/animation/frontend/qskeletonmapping.cpp
+++ b/src/animation/frontend/qskeletonmapping.cpp
@@ -95,3 +95,5 @@ void QSkeletonMapping::setSkeleton(Qt3DCore::QAbstractSkeleton *skeleton)
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qskeletonmapping.cpp"
diff --git a/src/animation/frontend/qvertexblendanimation.cpp b/src/animation/frontend/qvertexblendanimation.cpp
index 58e85581b..1b3b8e2eb 100644
--- a/src/animation/frontend/qvertexblendanimation.cpp
+++ b/src/animation/frontend/qvertexblendanimation.cpp
@@ -340,3 +340,5 @@ void QVertexBlendAnimation::updateAnimation(float position)
 } // Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_qvertexblendanimation.cpp"
diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h
index f3878ed55..fea5dc311 100644
--- a/src/core/aspects/qabstractaspect_p.h
+++ b/src/core/aspects/qabstractaspect_p.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtCore/QHash>
 #include <Qt3DCore/qabstractaspect.h>
 
 #include <Qt3DCore/private/qaspectjobproviderinterface_p.h>
diff --git a/src/core/doc/src/qmlextracontrollers.qdoc b/src/core/doc/src/qmlextracontrollers.qdoc
index f02f4b29f..a1c3cb0a6 100644
--- a/src/core/doc/src/qmlextracontrollers.qdoc
+++ b/src/core/doc/src/qmlextracontrollers.qdoc
@@ -151,7 +151,7 @@
     of the camera pan and tilt.
 */
 /*!
-    \qmlproperty real OrbitCameraController::zoomLimit
+    \qmlproperty real OrbitCameraController::zoomInLimit
 
     Holds the current zoom-in limit. The zoom-in limit determines how close to the view center
     the camera can be zoomed.
diff --git a/src/core/doc/src/qt3drender-porting-to-rhi.qdoc b/src/core/doc/src/qt3drender-porting-to-rhi.qdoc
index 4f1709872..c0a23861b 100644
--- a/src/core/doc/src/qt3drender-porting-to-rhi.qdoc
+++ b/src/core/doc/src/qt3drender-porting-to-rhi.qdoc
@@ -69,7 +69,7 @@
     \badcode
     Material {
         Effect {
-            technique: [
+            techniques: [
                 Technique {
                     id: gl3Technique
                     graphicsApiFilter {
diff --git a/src/core/jobs/qthreadpooler.cpp b/src/core/jobs/qthreadpooler.cpp
index 36ab5ba40..6dfd9f320 100644
--- a/src/core/jobs/qthreadpooler.cpp
+++ b/src/core/jobs/qthreadpooler.cpp
@@ -50,7 +50,7 @@ QThreadPooler::QThreadPooler(QObject *parent)
     , m_futureInterface(nullptr)
     , m_mutex()
     , m_taskCount(0)
-    , m_threadPool(QThreadPool::globalInstance())
+    , m_threadPool(new QThreadPool(this))
     , m_totalRunJobs(0)
 {
     m_threadPool->setMaxThreadCount(QAspectJobManager::idealThreadCount());
diff --git a/src/core/jobs/qthreadpooler_p.h b/src/core/jobs/qthreadpooler_p.h
index 058da2fc9..8d8be8d23 100644
--- a/src/core/jobs/qthreadpooler_p.h
+++ b/src/core/jobs/qthreadpooler_p.h
@@ -77,8 +77,6 @@ public:
     void taskFinished(RunnableInterface *task);
     QFuture<void> future();
 
-    static int maxThreadCount();
-
 private:
     void enqueueTasks(const QList<RunnableInterface *> &tasks);
     void skipTask(RunnableInterface *task);
diff --git a/src/extras/3dtext/qextrudedtextgeometry.cpp b/src/extras/3dtext/qextrudedtextgeometry.cpp
index 1c9208ea9..4ff4533c9 100644
--- a/src/extras/3dtext/qextrudedtextgeometry.cpp
+++ b/src/extras/3dtext/qextrudedtextgeometry.cpp
@@ -512,3 +512,5 @@ Qt3DCore::QAttribute *QExtrudedTextGeometry::indexAttribute() const
 } // Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qextrudedtextgeometry.cpp"
diff --git a/src/extras/3dtext/qextrudedtextmesh.cpp b/src/extras/3dtext/qextrudedtextmesh.cpp
index fc93726d2..d6555b52b 100644
--- a/src/extras/3dtext/qextrudedtextmesh.cpp
+++ b/src/extras/3dtext/qextrudedtextmesh.cpp
@@ -167,3 +167,5 @@ float QExtrudedTextMesh::depth() const
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qextrudedtextmesh.cpp"
diff --git a/src/extras/defaults/qabstractcameracontroller.cpp b/src/extras/defaults/qabstractcameracontroller.cpp
index dafe1fde8..f50b8c987 100644
--- a/src/extras/defaults/qabstractcameracontroller.cpp
+++ b/src/extras/defaults/qabstractcameracontroller.cpp
@@ -288,7 +288,8 @@ QAbstractCameraController::QAbstractCameraController(QAbstractCameraControllerPr
     d->init();
 
     QObject::connect(d->m_frameAction, &Qt3DLogic::QFrameAction::triggered,
-                     this, [=] (float dt) {
+                     this, [this] (float dt) {
+        Q_D(const QAbstractCameraController);
         InputState  state;
 
         state.rxAxisValue = d->m_rxAxis->value();
diff --git a/src/extras/defaults/qabstractspritesheet.cpp b/src/extras/defaults/qabstractspritesheet.cpp
index 2cf134f7c..d70e924c4 100644
--- a/src/extras/defaults/qabstractspritesheet.cpp
+++ b/src/extras/defaults/qabstractspritesheet.cpp
@@ -141,3 +141,5 @@ void QAbstractSpriteSheet::setCurrentIndex(int currentIndex)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qabstractspritesheet.cpp"
diff --git a/src/extras/defaults/qdiffusemapmaterial.cpp b/src/extras/defaults/qdiffusemapmaterial.cpp
index bd9785e2e..ce3726454 100644
--- a/src/extras/defaults/qdiffusemapmaterial.cpp
+++ b/src/extras/defaults/qdiffusemapmaterial.cpp
@@ -359,3 +359,5 @@ void QDiffuseMapMaterial::setTextureScale(float textureScale)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qdiffusemapmaterial.cpp"
diff --git a/src/extras/defaults/qdiffusespecularmapmaterial.cpp b/src/extras/defaults/qdiffusespecularmapmaterial.cpp
index 8f1dd66e1..1d9f6e54c 100644
--- a/src/extras/defaults/qdiffusespecularmapmaterial.cpp
+++ b/src/extras/defaults/qdiffusespecularmapmaterial.cpp
@@ -378,3 +378,5 @@ void QDiffuseSpecularMapMaterial::setTextureScale(float textureScale)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qdiffusespecularmapmaterial.cpp"
diff --git a/src/extras/defaults/qdiffusespecularmaterial.cpp b/src/extras/defaults/qdiffusespecularmaterial.cpp
index 2a1139aef..db44fcb8d 100644
--- a/src/extras/defaults/qdiffusespecularmaterial.cpp
+++ b/src/extras/defaults/qdiffusespecularmaterial.cpp
@@ -539,3 +539,5 @@ void QDiffuseSpecularMaterial::setAlphaBlendingEnabled(bool enabled)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qdiffusespecularmaterial.cpp"
diff --git a/src/extras/defaults/qforwardrenderer.cpp b/src/extras/defaults/qforwardrenderer.cpp
index 71d99d84b..42283e88f 100644
--- a/src/extras/defaults/qforwardrenderer.cpp
+++ b/src/extras/defaults/qforwardrenderer.cpp
@@ -394,3 +394,5 @@ bool QForwardRenderer::showDebugOverlay() const
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qforwardrenderer.cpp"
diff --git a/src/extras/defaults/qgoochmaterial.cpp b/src/extras/defaults/qgoochmaterial.cpp
index b5665d776..a0088c80a 100644
--- a/src/extras/defaults/qgoochmaterial.cpp
+++ b/src/extras/defaults/qgoochmaterial.cpp
@@ -377,3 +377,5 @@ void QGoochMaterial::setShininess(float shininess)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qgoochmaterial.cpp"
diff --git a/src/extras/defaults/qmetalroughmaterial.cpp b/src/extras/defaults/qmetalroughmaterial.cpp
index 79ff94337..0e3cab916 100644
--- a/src/extras/defaults/qmetalroughmaterial.cpp
+++ b/src/extras/defaults/qmetalroughmaterial.cpp
@@ -505,3 +505,5 @@ void QMetalRoughMaterial::setTextureScale(float textureScale)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qmetalroughmaterial.cpp"
diff --git a/src/extras/defaults/qmorphphongmaterial.cpp b/src/extras/defaults/qmorphphongmaterial.cpp
index e5b94837c..8a4be35b1 100644
--- a/src/extras/defaults/qmorphphongmaterial.cpp
+++ b/src/extras/defaults/qmorphphongmaterial.cpp
@@ -333,3 +333,5 @@ void QMorphPhongMaterial::setInterpolator(float interpolator)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qmorphphongmaterial.cpp"
diff --git a/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp b/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp
index b618742a0..031e0552e 100644
--- a/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp
+++ b/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp
@@ -219,3 +219,5 @@ QNormalDiffuseMapAlphaMaterial::~QNormalDiffuseMapAlphaMaterial()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qnormaldiffusemapalphamaterial.cpp"
diff --git a/src/extras/defaults/qnormaldiffusemapmaterial.cpp b/src/extras/defaults/qnormaldiffusemapmaterial.cpp
index 95e031233..5044c58c6 100644
--- a/src/extras/defaults/qnormaldiffusemapmaterial.cpp
+++ b/src/extras/defaults/qnormaldiffusemapmaterial.cpp
@@ -408,3 +408,5 @@ void QNormalDiffuseMapMaterial::setTextureScale(float textureScale)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qnormaldiffusemapmaterial.cpp"
diff --git a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp
index 69fd34e19..84f206a06 100644
--- a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp
+++ b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp
@@ -425,3 +425,5 @@ void QNormalDiffuseSpecularMapMaterial::setTextureScale(float textureScale)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qnormaldiffusespecularmapmaterial.cpp"
diff --git a/src/extras/defaults/qpervertexcolormaterial.cpp b/src/extras/defaults/qpervertexcolormaterial.cpp
index ef41cbce7..53ea83a7d 100644
--- a/src/extras/defaults/qpervertexcolormaterial.cpp
+++ b/src/extras/defaults/qpervertexcolormaterial.cpp
@@ -175,3 +175,5 @@ void QPerVertexColorMaterialPrivate::init()
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qpervertexcolormaterial.cpp"
diff --git a/src/extras/defaults/qphongalphamaterial.cpp b/src/extras/defaults/qphongalphamaterial.cpp
index 57c81b721..573b3f8e5 100644
--- a/src/extras/defaults/qphongalphamaterial.cpp
+++ b/src/extras/defaults/qphongalphamaterial.cpp
@@ -470,3 +470,5 @@ void QPhongAlphaMaterial::setBlendFunctionArg(QBlendEquation::BlendFunction blen
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qphongalphamaterial.cpp"
diff --git a/src/extras/defaults/qphongmaterial.cpp b/src/extras/defaults/qphongmaterial.cpp
index 465db7a5c..6240f60ba 100644
--- a/src/extras/defaults/qphongmaterial.cpp
+++ b/src/extras/defaults/qphongmaterial.cpp
@@ -310,3 +310,5 @@ void QPhongMaterial::setShininess(float shininess)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qphongmaterial.cpp"
diff --git a/src/extras/defaults/qskyboxentity.cpp b/src/extras/defaults/qskyboxentity.cpp
index 163cf63a4..89d6d7973 100644
--- a/src/extras/defaults/qskyboxentity.cpp
+++ b/src/extras/defaults/qskyboxentity.cpp
@@ -384,3 +384,5 @@ bool QSkyboxEntity::isGammaCorrectEnabled() const
     \since 5.9
 */
 QT_END_NAMESPACE
+
+#include "moc_qskyboxentity.cpp"
diff --git a/src/extras/defaults/qspritegrid.cpp b/src/extras/defaults/qspritegrid.cpp
index 15016a891..0e4ab20ab 100644
--- a/src/extras/defaults/qspritegrid.cpp
+++ b/src/extras/defaults/qspritegrid.cpp
@@ -154,3 +154,5 @@ void QSpriteGrid::setColumns(int columns)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qspritegrid.cpp"
diff --git a/src/extras/defaults/qspritesheet.cpp b/src/extras/defaults/qspritesheet.cpp
index 94f608f4a..020362a0e 100644
--- a/src/extras/defaults/qspritesheet.cpp
+++ b/src/extras/defaults/qspritesheet.cpp
@@ -171,3 +171,5 @@ void QSpriteSheet::setSprites(QList<QSpriteSheetItem *> sprites)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qspritesheet.cpp"
diff --git a/src/extras/defaults/qspritesheetitem.cpp b/src/extras/defaults/qspritesheetitem.cpp
index b4e096ae9..e05e41bef 100644
--- a/src/extras/defaults/qspritesheetitem.cpp
+++ b/src/extras/defaults/qspritesheetitem.cpp
@@ -125,3 +125,5 @@ void QSpriteSheetItem::setHeight(int height)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qspritesheetitem.cpp"
diff --git a/src/extras/defaults/qt3dwindow.cpp b/src/extras/defaults/qt3dwindow.cpp
index 04a0c5b5a..85ca73cca 100644
--- a/src/extras/defaults/qt3dwindow.cpp
+++ b/src/extras/defaults/qt3dwindow.cpp
@@ -363,3 +363,5 @@ void setupWindowSurface(QWindow *window, Qt3DRender::API api) noexcept
 } // Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qt3dwindow.cpp"
diff --git a/src/extras/defaults/qtexturematerial.cpp b/src/extras/defaults/qtexturematerial.cpp
index b38d6551d..f3a63ce6f 100644
--- a/src/extras/defaults/qtexturematerial.cpp
+++ b/src/extras/defaults/qtexturematerial.cpp
@@ -302,3 +302,5 @@ void QTextureMaterial::setAlphaBlendingEnabled(bool enabled)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qtexturematerial.cpp"
diff --git a/src/extras/geometries/qconegeometry.cpp b/src/extras/geometries/qconegeometry.cpp
index e2165e6f8..258d85bb7 100644
--- a/src/extras/geometries/qconegeometry.cpp
+++ b/src/extras/geometries/qconegeometry.cpp
@@ -673,3 +673,5 @@ QAttribute *QConeGeometry::indexAttribute() const
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qconegeometry.cpp"
diff --git a/src/extras/geometries/qconegeometryview.cpp b/src/extras/geometries/qconegeometryview.cpp
index 28707d043..519c488f0 100644
--- a/src/extras/geometries/qconegeometryview.cpp
+++ b/src/extras/geometries/qconegeometryview.cpp
@@ -238,3 +238,5 @@ float QConeGeometryView::length() const
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qconegeometryview.cpp"
diff --git a/src/extras/geometries/qconemesh.cpp b/src/extras/geometries/qconemesh.cpp
index 5f4ebd369..6b391b1d3 100644
--- a/src/extras/geometries/qconemesh.cpp
+++ b/src/extras/geometries/qconemesh.cpp
@@ -238,3 +238,5 @@ float QConeMesh::length() const
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qconemesh.cpp"
diff --git a/src/extras/geometries/qcuboidgeometry.cpp b/src/extras/geometries/qcuboidgeometry.cpp
index 87707eefd..978670cd7 100644
--- a/src/extras/geometries/qcuboidgeometry.cpp
+++ b/src/extras/geometries/qcuboidgeometry.cpp
@@ -838,3 +838,5 @@ QAttribute *QCuboidGeometry::indexAttribute() const
 } //  Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qcuboidgeometry.cpp"
diff --git a/src/extras/geometries/qcuboidgeometryview.cpp b/src/extras/geometries/qcuboidgeometryview.cpp
index ee0977b71..ee21f3526 100644
--- a/src/extras/geometries/qcuboidgeometryview.cpp
+++ b/src/extras/geometries/qcuboidgeometryview.cpp
@@ -225,3 +225,5 @@ QSize QCuboidGeometryView::xyMeshResolution() const
 } // namespace  Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qcuboidgeometryview.cpp"
diff --git a/src/extras/geometries/qcuboidmesh.cpp b/src/extras/geometries/qcuboidmesh.cpp
index 5440ef0ba..78f742424 100644
--- a/src/extras/geometries/qcuboidmesh.cpp
+++ b/src/extras/geometries/qcuboidmesh.cpp
@@ -225,3 +225,5 @@ QSize QCuboidMesh::xyMeshResolution() const
 } // namespace  Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qcuboidmesh.cpp"
diff --git a/src/extras/geometries/qcylindergeometry.cpp b/src/extras/geometries/qcylindergeometry.cpp
index 5d37b5ac8..f16705c77 100644
--- a/src/extras/geometries/qcylindergeometry.cpp
+++ b/src/extras/geometries/qcylindergeometry.cpp
@@ -546,3 +546,5 @@ QAttribute *QCylinderGeometry::indexAttribute() const
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qcylindergeometry.cpp"
diff --git a/src/extras/geometries/qcylindergeometryview.cpp b/src/extras/geometries/qcylindergeometryview.cpp
index 9347f1134..6bedb4756 100644
--- a/src/extras/geometries/qcylindergeometryview.cpp
+++ b/src/extras/geometries/qcylindergeometryview.cpp
@@ -182,3 +182,5 @@ float QCylinderGeometryView::length() const
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qcylindergeometryview.cpp"
diff --git a/src/extras/geometries/qcylindermesh.cpp b/src/extras/geometries/qcylindermesh.cpp
index 2c2bb4d81..31a633e55 100644
--- a/src/extras/geometries/qcylindermesh.cpp
+++ b/src/extras/geometries/qcylindermesh.cpp
@@ -182,3 +182,5 @@ float QCylinderMesh::length() const
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qcylindermesh.cpp"
diff --git a/src/extras/geometries/qplanegeometry.cpp b/src/extras/geometries/qplanegeometry.cpp
index e83548ad5..41d7ed4b9 100644
--- a/src/extras/geometries/qplanegeometry.cpp
+++ b/src/extras/geometries/qplanegeometry.cpp
@@ -517,3 +517,5 @@ QByteArray QPlaneGeometryPrivate::generateIndexData() const
 } //  Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qplanegeometry.cpp"
diff --git a/src/extras/geometries/qplanegeometryview.cpp b/src/extras/geometries/qplanegeometryview.cpp
index dd1544b3b..e4e1f6295 100644
--- a/src/extras/geometries/qplanegeometryview.cpp
+++ b/src/extras/geometries/qplanegeometryview.cpp
@@ -173,3 +173,5 @@ bool QPlaneGeometryView::mirrored() const
 } // namespace  Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qplanegeometryview.cpp"
diff --git a/src/extras/geometries/qplanemesh.cpp b/src/extras/geometries/qplanemesh.cpp
index ebcaa1d9c..78714ddaf 100644
--- a/src/extras/geometries/qplanemesh.cpp
+++ b/src/extras/geometries/qplanemesh.cpp
@@ -175,3 +175,5 @@ bool QPlaneMesh::mirrored() const
 } // namespace  Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qplanemesh.cpp"
diff --git a/src/extras/geometries/qspheregeometry.cpp b/src/extras/geometries/qspheregeometry.cpp
index c780ba83c..61ab08f4c 100644
--- a/src/extras/geometries/qspheregeometry.cpp
+++ b/src/extras/geometries/qspheregeometry.cpp
@@ -541,3 +541,5 @@ QAttribute *QSphereGeometry::indexAttribute() const
 
 QT_END_NAMESPACE
 
+#include "moc_qspheregeometry.cpp"
+
diff --git a/src/extras/geometries/qspheregeometryview.cpp b/src/extras/geometries/qspheregeometryview.cpp
index 6ac72ad82..f3cb83b94 100644
--- a/src/extras/geometries/qspheregeometryview.cpp
+++ b/src/extras/geometries/qspheregeometryview.cpp
@@ -172,3 +172,5 @@ float QSphereGeometryView::radius() const
 } // Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qspheregeometryview.cpp"
diff --git a/src/extras/geometries/qspheremesh.cpp b/src/extras/geometries/qspheremesh.cpp
index fa2b795c8..11aa38aec 100644
--- a/src/extras/geometries/qspheremesh.cpp
+++ b/src/extras/geometries/qspheremesh.cpp
@@ -172,3 +172,5 @@ float QSphereMesh::radius() const
 } // Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qspheremesh.cpp"
diff --git a/src/extras/geometries/qtorusgeometry.cpp b/src/extras/geometries/qtorusgeometry.cpp
index c9b430043..5a0bdd820 100644
--- a/src/extras/geometries/qtorusgeometry.cpp
+++ b/src/extras/geometries/qtorusgeometry.cpp
@@ -501,3 +501,5 @@ QAttribute *QTorusGeometry::indexAttribute() const
 } //  Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qtorusgeometry.cpp"
diff --git a/src/extras/geometries/qtorusgeometryview.cpp b/src/extras/geometries/qtorusgeometryview.cpp
index 958d17974..907e5596c 100644
--- a/src/extras/geometries/qtorusgeometryview.cpp
+++ b/src/extras/geometries/qtorusgeometryview.cpp
@@ -175,3 +175,5 @@ float QTorusGeometryView::minorRadius() const
 } // namespace  Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qtorusgeometryview.cpp"
diff --git a/src/extras/geometries/qtorusmesh.cpp b/src/extras/geometries/qtorusmesh.cpp
index ddcec3ece..16add5779 100644
--- a/src/extras/geometries/qtorusmesh.cpp
+++ b/src/extras/geometries/qtorusmesh.cpp
@@ -176,3 +176,5 @@ float QTorusMesh::minorRadius() const
 } // namespace  Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qtorusmesh.cpp"
diff --git a/src/extras/text/distancefieldtextrenderer.cpp b/src/extras/text/distancefieldtextrenderer.cpp
index 3cafd93df..8a4c192d2 100644
--- a/src/extras/text/distancefieldtextrenderer.cpp
+++ b/src/extras/text/distancefieldtextrenderer.cpp
@@ -154,3 +154,5 @@ void DistanceFieldTextRenderer::setColor(const QColor &color)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_distancefieldtextrenderer_p.cpp"
diff --git a/src/extras/text/qtext2dentity.cpp b/src/extras/text/qtext2dentity.cpp
index f9edbe090..e4dc93f10 100644
--- a/src/extras/text/qtext2dentity.cpp
+++ b/src/extras/text/qtext2dentity.cpp
@@ -490,3 +490,5 @@ void QText2DEntity::setHeight(float height)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qtext2dentity.cpp"
diff --git a/src/extras/text/qtext2dmaterial.cpp b/src/extras/text/qtext2dmaterial.cpp
index 2070bf15f..8df65d069 100644
--- a/src/extras/text/qtext2dmaterial.cpp
+++ b/src/extras/text/qtext2dmaterial.cpp
@@ -195,3 +195,5 @@ void QText2DMaterial::setDistanceFieldTexture(Qt3DRender::QAbstractTexture *tex)
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qtext2dmaterial_p.cpp"
diff --git a/src/extras/text/qtextureatlas.cpp b/src/extras/text/qtextureatlas.cpp
index 97f9845e0..ef2035a68 100644
--- a/src/extras/text/qtextureatlas.cpp
+++ b/src/extras/text/qtextureatlas.cpp
@@ -297,3 +297,5 @@ int QTextureAtlas::imagePadding(TextureId id) const
 } // namespace Qt3DExtras
 
 QT_END_NAMESPACE
+
+#include "moc_qtextureatlas_p.cpp"
diff --git a/src/logic/executor.cpp b/src/logic/executor.cpp
index b12c54ebe..66b9fd9f9 100644
--- a/src/logic/executor.cpp
+++ b/src/logic/executor.cpp
@@ -78,3 +78,5 @@ void Executor::processLogicFrameUpdates(const QList<QNodeId> &nodeIds, float dt)
 } // namespace Qt3DLogic
 
 QT_END_NAMESPACE
+
+#include "moc_executor_p.cpp"
diff --git a/src/logic/qframeaction.cpp b/src/logic/qframeaction.cpp
index a3ae748be..b23cd9797 100644
--- a/src/logic/qframeaction.cpp
+++ b/src/logic/qframeaction.cpp
@@ -137,3 +137,5 @@ void QFrameAction::onTriggered(float dt)
 } // namespace Qt3DLogic
 
 QT_END_NAMESPACE
+
+#include "moc_qframeaction.cpp"
diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp
index 39114ad39..dc665201c 100644
--- a/src/logic/qlogicaspect.cpp
+++ b/src/logic/qlogicaspect.cpp
@@ -144,3 +144,4 @@ QT_END_NAMESPACE
 
 QT3D_REGISTER_NAMESPACED_ASPECT("logic", QT_PREPEND_NAMESPACE(Qt3DLogic), QLogicAspect)
 
+#include "moc_qlogicaspect.cpp"
diff --git a/src/plugins/geometryloaders/default/basegeometryloader.cpp b/src/plugins/geometryloaders/default/basegeometryloader.cpp
index 33e68db82..1d25c8de6 100644
--- a/src/plugins/geometryloaders/default/basegeometryloader.cpp
+++ b/src/plugins/geometryloaders/default/basegeometryloader.cpp
@@ -280,3 +280,5 @@ void BaseGeometryLoader::center(std::vector<QVector3D> &points)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_basegeometryloader_p.cpp"
diff --git a/src/plugins/geometryloaders/default/objgeometryloader.cpp b/src/plugins/geometryloaders/default/objgeometryloader.cpp
index 14a2b588e..8515b2ffa 100644
--- a/src/plugins/geometryloaders/default/objgeometryloader.cpp
+++ b/src/plugins/geometryloaders/default/objgeometryloader.cpp
@@ -39,6 +39,7 @@
 
 #include "objgeometryloader.h"
 
+#include <QtCore/QHash>
 #include <QtCore/QLoggingCategory>
 #include <QtCore/QRegularExpression>
 #include <QtCore/QIODevice>
diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
index 9f13ca2c6..0962e47ce 100644
--- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
+++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp
@@ -626,3 +626,5 @@ uint GLTFGeometryLoader::accessorDataSizeFromJson(const QString &type)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_gltfgeometryloader.cpp"
diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.h b/src/plugins/geometryloaders/gltf/gltfgeometryloader.h
index 36ac0f174..f3a0961ab 100644
--- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.h
+++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.h
@@ -51,6 +51,7 @@
 // We mean it.
 //
 
+#include <QtCore/QHash>
 #include <QtCore/QJsonDocument>
 
 #include <Qt3DRender/private/qgeometryloaderinterface_p.h>
diff --git a/src/plugins/renderers/opengl/renderer/renderer.cpp b/src/plugins/renderers/opengl/renderer/renderer.cpp
index e09423005..355556225 100644
--- a/src/plugins/renderers/opengl/renderer/renderer.cpp
+++ b/src/plugins/renderers/opengl/renderer/renderer.cpp
@@ -1640,6 +1640,7 @@ Renderer::ViewSubmissionResultData Renderer::submitRenderViews(const std::vector
                     static_cast<Render::RenderCapture*>(m_nodesManager->frameGraphManager()->lookupNode(renderView->renderCaptureNodeId()));
             renderCapture->addRenderCapture(request.captureId, image);
             const QNodeId renderCaptureId = renderView->renderCaptureNodeId();
+            QMutexLocker lock(&m_pendingRenderCaptureSendRequestsMutex);
             if (!Qt3DCore::contains(m_pendingRenderCaptureSendRequests, renderCaptureId))
                 m_pendingRenderCaptureSendRequests.push_back(renderView->renderCaptureNodeId());
         }
@@ -1750,7 +1751,9 @@ void Renderer::jobsDone(Qt3DCore::QAspectManager *manager)
     // called in main thread once all jobs are done running
 
     // sync captured renders to frontend
+    QMutexLocker lock(&m_pendingRenderCaptureSendRequestsMutex);
     const std::vector<Qt3DCore::QNodeId> pendingCaptureIds = Qt3DCore::moveAndClear(m_pendingRenderCaptureSendRequests);
+    lock.unlock();
     for (const Qt3DCore::QNodeId &id : pendingCaptureIds) {
         auto *backend = static_cast<Qt3DRender::Render::RenderCapture *>
             (m_nodesManager->frameGraphManager()->lookupNode(id));
diff --git a/src/plugins/renderers/opengl/renderer/renderer_p.h b/src/plugins/renderers/opengl/renderer/renderer_p.h
index 78dfbe2a5..151d2a5cf 100644
--- a/src/plugins/renderers/opengl/renderer/renderer_p.h
+++ b/src/plugins/renderers/opengl/renderer/renderer_p.h
@@ -359,6 +359,7 @@ private:
     RenderableEntityFilterPtr m_renderableEntityFilterJob;
     ComputableEntityFilterPtr m_computableEntityFilterJob;
 
+    QMutex m_pendingRenderCaptureSendRequestsMutex;
     std::vector<Qt3DCore::QNodeId> m_pendingRenderCaptureSendRequests;
 
     void performDraw(const RenderCommand *command);
diff --git a/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp b/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp
index d21c205c3..7715e26bf 100644
--- a/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp
+++ b/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp
@@ -40,8 +40,7 @@
 #include "renderviewbuilder_p.h"
 #include <Qt3DRender/private/qrenderaspect_p.h>
 #include <Qt3DRender/private/rendersyncjobs_p.h>
-
-#include <QThread>
+#include <Qt3DCore/private/qaspectjobmanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -90,7 +89,7 @@ RenderViewBuilder::RenderViewBuilder(Render::FrameGraphNode *leafNode, int rende
     // In some cases having less jobs is better (especially on fast cpus where
     // splitting just adds more overhead). Ideally, we should try to set the value
     // depending on the platform/CPU/nbr of cores
-    m_optimalParallelJobCount = QThread::idealThreadCount();
+    m_optimalParallelJobCount = Qt3DCore::QAspectJobManager::idealThreadCount();
 }
 
 RenderViewInitializerJobPtr RenderViewBuilder::renderViewJob() const
diff --git a/src/plugins/renderers/rhi/renderer/renderer.cpp b/src/plugins/renderers/rhi/renderer/renderer.cpp
index 5c783a48d..b5cc62ff1 100644
--- a/src/plugins/renderers/rhi/renderer/renderer.cpp
+++ b/src/plugins/renderers/rhi/renderer/renderer.cpp
@@ -2199,8 +2199,10 @@ void Renderer::jobsDone(Qt3DCore::QAspectManager *manager)
     // called in main thread once all jobs are done running
 
     // sync captured renders to frontend
+    QMutexLocker lock(&m_pendingRenderCaptureSendRequestsMutex);
     const std::vector<Qt3DCore::QNodeId> pendingCaptureIds =
             Qt3DCore::moveAndClear(m_pendingRenderCaptureSendRequests);
+    lock.unlock();
     for (const Qt3DCore::QNodeId &id : qAsConst(pendingCaptureIds)) {
         auto *backend = static_cast<Qt3DRender::Render::RenderCapture *>(
                 m_nodesManager->frameGraphManager()->lookupNode(id));
@@ -2786,6 +2788,7 @@ bool Renderer::executeCommandsSubmission(const RHIPassInfo &passInfo)
 
                         Render::RenderCapture *renderCapture = static_cast<Render::RenderCapture*>(m_nodesManager->frameGraphManager()->lookupNode(renderCaptureId));
                         renderCapture->addRenderCapture(request.captureId, image);
+                        QMutexLocker lock(&m_pendingRenderCaptureSendRequestsMutex);
                         if (!Qt3DCore::contains(m_pendingRenderCaptureSendRequests, renderCaptureId))
                             m_pendingRenderCaptureSendRequests.push_back(renderCaptureId);
                     };
diff --git a/src/plugins/renderers/rhi/renderer/renderer_p.h b/src/plugins/renderers/rhi/renderer/renderer_p.h
index cb2137d95..281cbe533 100644
--- a/src/plugins/renderers/rhi/renderer/renderer_p.h
+++ b/src/plugins/renderers/rhi/renderer/renderer_p.h
@@ -360,6 +360,7 @@ private:
     RenderableEntityFilterPtr m_renderableEntityFilterJob;
     ComputableEntityFilterPtr m_computableEntityFilterJob;
 
+    QMutex m_pendingRenderCaptureSendRequestsMutex;
     std::vector<Qt3DCore::QNodeId> m_pendingRenderCaptureSendRequests;
 
     SynchronizerJobPtr m_bufferGathererJob;
diff --git a/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp b/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp
index 832f550eb..c69fd762b 100644
--- a/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp
+++ b/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp
@@ -39,8 +39,7 @@
 
 #include "renderviewbuilder_p.h"
 #include <Qt3DRender/private/qrenderaspect_p.h>
-
-#include <QThread>
+#include <Qt3DCore/private/qaspectjobmanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -63,7 +62,7 @@ RenderViewBuilder::RenderViewBuilder(Render::FrameGraphNode *leafNode, int rende
     // In some cases having less jobs is better (especially on fast cpus where
     // splitting just adds more overhead). Ideally, we should try to set the value
     // depending on the platform/CPU/nbr of cores
-    m_optimalParallelJobCount = QThread::idealThreadCount();
+    m_optimalParallelJobCount = Qt3DCore::QAspectJobManager::idealThreadCount();
 }
 
 RenderViewInitializerJobPtr RenderViewBuilder::renderViewJob() const
diff --git a/src/plugins/sceneparsers/assimp/assimphelpers.cpp b/src/plugins/sceneparsers/assimp/assimphelpers.cpp
index 77209a7a9..2f81e460c 100644
--- a/src/plugins/sceneparsers/assimp/assimphelpers.cpp
+++ b/src/plugins/sceneparsers/assimp/assimphelpers.cpp
@@ -45,6 +45,8 @@
 #include <QtCore/QDir>
 #include <QtCore/QDebug>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
@@ -208,9 +210,9 @@ Assimp::IOStream *AssimpIOSystem::Open(const char *pFile, const char *pMode)
     const QLatin1String cleanedMode = QLatin1String{pMode}.trimmed();
 
     if (const QIODevice::OpenMode openMode = openModeFromText(cleanedMode.data())) {
-        QScopedPointer<QFile> file(new QFile(fileName));
+        auto file = std::make_unique<QFile>(fileName);
         if (file->open(openMode))
-            return new AssimpIOStream(file.take());
+            return new AssimpIOStream(file.release());
     }
     return nullptr;
 }
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
index 1a775d888..8e21a7dbd 100644
--- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
@@ -1402,4 +1402,6 @@ AssimpImporter::SceneImporter::~SceneImporter()
 
 QT_END_NAMESPACE
 
+#include "moc_assimpimporter.cpp"
+
 #include "assimpimporter.moc"
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.h b/src/plugins/sceneparsers/assimp/assimpimporter.h
index c1c8537cc..0488ec652 100644
--- a/src/plugins/sceneparsers/assimp/assimpimporter.h
+++ b/src/plugins/sceneparsers/assimp/assimpimporter.h
@@ -58,6 +58,7 @@
 #include <assimp/DefaultLogger.hpp>
 
 #include <QtCore/QDir>
+#include <QtCore/QHash>
 #include <QtCore/QList>
 #include <QtCore/QLoggingCategory>
 
diff --git a/src/plugins/sceneparsers/gltf/gltfimporter.cpp b/src/plugins/sceneparsers/gltf/gltfimporter.cpp
index 67510486a..eff2a5ecf 100644
--- a/src/plugins/sceneparsers/gltf/gltfimporter.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfimporter.cpp
@@ -2630,4 +2630,5 @@ bool GLTFRawTextureImage::GLTFRawTextureImageFunctor::operator ==(const QTexture
 
 QT_END_NAMESPACE
 
+#include "moc_gltfimporter.cpp"
 #include "gltfimporter.moc"
diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.h b/src/plugins/sceneparsers/gltfexport/gltfexporter.h
index 0d30a2064..254bc2e2a 100644
--- a/src/plugins/sceneparsers/gltfexport/gltfexporter.h
+++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.h
@@ -54,6 +54,7 @@
 #include <QtCore/qjsondocument.h>
 #include <QtCore/qjsonobject.h>
 #include <QtCore/qhash.h>
+#include <QtCore/qset.h>
 #include <QtGui/qvector3d.h>
 
 #include <Qt3DRender/qabstractlight.h>
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
index de476918d..95b1c4153 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
@@ -89,3 +89,5 @@ Qt3DQuick3DCorePlugin::~Qt3DQuick3DCorePlugin()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qt3dquick3dcoreplugin.cpp"
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
index a7bdd62db..5492b4788 100644
--- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
+++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
@@ -159,3 +159,5 @@ void Qt3DQuick3DExtrasPlugin::registerTypes(const char *uri)
 
 
 QT_END_NAMESPACE
+
+#include "moc_qt3dquick3dextrasplugin.cpp"
diff --git a/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp b/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp
index 0ddb9eb0c..4693f21b8 100644
--- a/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp
+++ b/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp
@@ -63,3 +63,5 @@ void QtQuickScene2DPlugin::registerTypes(const char *uri)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qtquickscene2dplugin.cpp"
diff --git a/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp b/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp
index fa79af1cd..338a7ef7f 100644
--- a/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp
+++ b/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp
@@ -56,3 +56,5 @@ void QtQuickScene3DPlugin::registerTypes(const char *uri)
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qtquickscene3dplugin.cpp"
diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp
index 6f84fff7e..f6bcb63a7 100644
--- a/src/quick3d/imports/scene3d/scene3ditem.cpp
+++ b/src/quick3d/imports/scene3d/scene3ditem.cpp
@@ -908,4 +908,5 @@ void Scene3DItem::mousePressEvent(QMouseEvent *event)
 
 QT_END_NAMESPACE
 
+#include "moc_scene3ditem_p.cpp"
 #include "scene3ditem.moc"
diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp
index e99705006..7c6a925fe 100644
--- a/src/quick3d/imports/scene3d/scene3drenderer.cpp
+++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp
@@ -663,3 +663,5 @@ Scene3DRenderer::QuickRenderer::~QuickRenderer() {}
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_scene3drenderer_p.cpp"
diff --git a/src/quick3d/quick3d/items/quick3dbuffer.cpp b/src/quick3d/quick3d/items/quick3dbuffer.cpp
index 159eb1017..e9ace7349 100644
--- a/src/quick3d/quick3d/items/quick3dbuffer.cpp
+++ b/src/quick3d/quick3d/items/quick3dbuffer.cpp
@@ -141,3 +141,5 @@ void Quick3DBuffer::initEngines()
 } // Qt3DCore
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dbuffer_p.cpp"
diff --git a/src/quick3d/quick3d/items/quick3dentity.cpp b/src/quick3d/quick3d/items/quick3dentity.cpp
index 0ef1f8863..0ee35e07e 100644
--- a/src/quick3d/quick3d/items/quick3dentity.cpp
+++ b/src/quick3d/quick3d/items/quick3dentity.cpp
@@ -118,3 +118,5 @@ QQmlListProperty<QComponent> Quick3DEntity::componentList()
 } // namespace Qt3DCore
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dentity_p.cpp"
diff --git a/src/quick3d/quick3d/items/quick3dgeometry.cpp b/src/quick3d/quick3d/items/quick3dgeometry.cpp
index bcd25731d..03a30615c 100644
--- a/src/quick3d/quick3d/items/quick3dgeometry.cpp
+++ b/src/quick3d/quick3d/items/quick3dgeometry.cpp
@@ -85,3 +85,5 @@ QQmlListProperty<Qt3DCore::QAttribute> Quick3DGeometry::attributeList()
 } // namespace Qt3DCore
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dgeometry_p.cpp"
diff --git a/src/quick3d/quick3d/items/quick3djoint.cpp b/src/quick3d/quick3d/items/quick3djoint.cpp
index 91f84c5e1..00026460f 100644
--- a/src/quick3d/quick3d/items/quick3djoint.cpp
+++ b/src/quick3d/quick3d/items/quick3djoint.cpp
@@ -89,3 +89,5 @@ QQmlListProperty<QJoint> Quick3DJoint::childJoints()
 } // namespace Qt3DCore
 
 QT_END_NAMESPACE
+
+#include "moc_quick3djoint_p.cpp"
diff --git a/src/quick3d/quick3d/items/quick3dnode.cpp b/src/quick3d/quick3d/items/quick3dnode.cpp
index 7642fe4c7..9b48ac713 100644
--- a/src/quick3d/quick3d/items/quick3dnode.cpp
+++ b/src/quick3d/quick3d/items/quick3dnode.cpp
@@ -162,3 +162,6 @@ void Quick3DNode::childRemoved(int, QObject *obj)
 } // namespace Qt3DCore
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dnode_p.cpp"
+#include "moc_qt3dquickforeign_p.cpp"
diff --git a/src/quick3d/quick3d/qquaternionanimation.cpp b/src/quick3d/quick3d/qquaternionanimation.cpp
index 933a08ee4..78e07ea6a 100644
--- a/src/quick3d/quick3d/qquaternionanimation.cpp
+++ b/src/quick3d/quick3d/qquaternionanimation.cpp
@@ -257,3 +257,5 @@ void QQuaternionAnimation::setToZRotation(float f)
 } // namespace Qt3DCore
 
 QT_END_NAMESPACE
+
+#include "moc_qquaternionanimation_p.cpp"
diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
index a4084fec3..cc20d3834 100644
--- a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
+++ b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp
@@ -765,3 +765,5 @@ void QQuick3DQuaternionValueType::setZ(qreal z)
 } // namespace Qt3DCore
 
 QT_END_NAMESPACE
+
+#include "moc_qt3dquickvaluetypes_p.cpp"
diff --git a/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp b/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp
index 1f655dd36..012408d2d 100644
--- a/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp
+++ b/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp
@@ -89,3 +89,5 @@ QQmlListProperty<QAnimationGroup> QQuick3DAnimationController::animationGroups()
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_quick3danimationcontroller_p.cpp"
diff --git a/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp b/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp
index e07a195f1..df9187ba3 100644
--- a/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp
+++ b/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp
@@ -95,3 +95,5 @@ QQmlListProperty<Qt3DAnimation::QAbstractAnimation> QQuick3DAnimationGroup::anim
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_quick3danimationgroup_p.cpp"
diff --git a/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp b/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp
index 3c62ae03b..534e7ff9b 100644
--- a/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp
+++ b/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp
@@ -86,3 +86,5 @@ QQmlListProperty<QAbstractChannelMapping> Quick3DChannelMapper::qmlMappings()
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dchannelmapper_p.cpp"
diff --git a/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp
index 0a57f61c6..dea6117a6 100644
--- a/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp
+++ b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp
@@ -94,3 +94,5 @@ QQmlListProperty<Qt3DCore::QTransform> QQuick3DKeyframeAnimation::keyframes()
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dkeyframeanimation_p.cpp"
diff --git a/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp b/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp
index f1e88f5ef..532890b73 100644
--- a/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp
+++ b/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp
@@ -90,3 +90,5 @@ QQmlListProperty<Qt3DAnimation::QMorphTarget> QQuick3DMorphingAnimation::morphTa
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dmorphinganimation_p.cpp"
diff --git a/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp b/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp
index c960a9904..a216e7d14 100644
--- a/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp
+++ b/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp
@@ -90,3 +90,5 @@ QQmlListProperty<Qt3DCore::QAttribute> QQuick3DMorphTarget::attributes()
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dmorphtarget_p.cpp"
diff --git a/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp b/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp
index bf172580c..446f6d377 100644
--- a/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp
+++ b/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp
@@ -94,3 +94,5 @@ QQmlListProperty<Qt3DAnimation::QMorphTarget> QQuick3DVertexBlendAnimation::morp
 } // namespace Qt3DAnimation
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dvertexblendanimation_p.cpp"
diff --git a/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader.cpp b/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader.cpp
index ee505b1cf..d2766d8c9 100644
--- a/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader.cpp
+++ b/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader.cpp
@@ -191,4 +191,6 @@ QUrl Quick3DLevelOfDetailLoader::source() const
 
 QT_END_NAMESPACE
 
+#include "moc_quick3dlevelofdetailloader_p.cpp"
+
 
diff --git a/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp b/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp
index 361295382..182e80906 100644
--- a/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp
+++ b/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp
@@ -92,3 +92,5 @@ QQmlListProperty<Qt3DExtras::QSpriteSheetItem> Quick3DSpriteSheet::sprites()
 
 QT_END_NAMESPACE
 
+#include "moc_quick3dspritesheet_p.cpp"
+
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp
index 336e7b966..f03c52e16 100644
--- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp
+++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp
@@ -276,4 +276,5 @@ void Qt3DQuickWindow::updateCameraAspectRatio()
 
 QT_END_NAMESPACE
 
+#include "moc_qt3dquickwindow.cpp"
 #include "qt3dquickwindow.moc"
diff --git a/src/quick3d/quick3dinput/items/quick3daction.cpp b/src/quick3d/quick3dinput/items/quick3daction.cpp
index 10c1b5a56..2422cc20e 100644
--- a/src/quick3d/quick3dinput/items/quick3daction.cpp
+++ b/src/quick3d/quick3dinput/items/quick3daction.cpp
@@ -86,3 +86,5 @@ QQmlListProperty<QAbstractActionInput> Quick3DAction::qmlActionInputs()
 } // namespace Qt3DInput
 
 QT_END_NAMESPACE
+
+#include "moc_quick3daction_p.cpp"
diff --git a/src/quick3d/quick3dinput/items/quick3daxis.cpp b/src/quick3d/quick3dinput/items/quick3daxis.cpp
index 115fa4b78..592fb1e7b 100644
--- a/src/quick3d/quick3dinput/items/quick3daxis.cpp
+++ b/src/quick3d/quick3dinput/items/quick3daxis.cpp
@@ -87,3 +87,5 @@ QQmlListProperty<QAbstractAxisInput> Quick3DAxis::qmlAxisInputs()
 } // namespace Qt3DInput
 
 QT_END_NAMESPACE
+
+#include "moc_quick3daxis_p.cpp"
diff --git a/src/quick3d/quick3dinput/items/quick3dinputchord.cpp b/src/quick3d/quick3dinput/items/quick3dinputchord.cpp
index 669c251d2..ba83affb3 100644
--- a/src/quick3d/quick3dinput/items/quick3dinputchord.cpp
+++ b/src/quick3d/quick3dinput/items/quick3dinputchord.cpp
@@ -86,3 +86,5 @@ QQmlListProperty<QAbstractActionInput> Quick3DInputChord::qmlActionInputs()
 } // namespace Qt3DInput
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dinputchord_p.cpp"
diff --git a/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp b/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp
index 4d637c18b..f5eadbc19 100644
--- a/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp
+++ b/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp
@@ -87,3 +87,5 @@ QQmlListProperty<QAbstractActionInput> Quick3DInputSequence::qmlActionInputs()
 } // namespace Qt3DInput
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dinputsequence_p.cpp"
diff --git a/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp b/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp
index 061fe1433..b50dc5786 100644
--- a/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp
+++ b/src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp
@@ -118,3 +118,5 @@ QQmlListProperty<QAction> Quick3DLogicalDevice::qmlActions()
 } // namespace Qt3DInput
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dlogicaldevice_p.cpp"
diff --git a/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp b/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp
index 07b017735..1680e7465 100644
--- a/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp
+++ b/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp
@@ -86,3 +86,5 @@ QQmlListProperty<QAxisSetting> Quick3DPhysicalDevice::axisSettings()
 } // namespace Qt3DInput
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dphysicaldevice_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3deffect.cpp b/src/quick3d/quick3drender/items/quick3deffect.cpp
index 09045011b..d4fa51dfc 100644
--- a/src/quick3d/quick3drender/items/quick3deffect.cpp
+++ b/src/quick3d/quick3drender/items/quick3deffect.cpp
@@ -129,3 +129,5 @@ QQmlListProperty<QParameter> Quick3DEffect::parameterList()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_quick3deffect_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
index 431391af6..8f279d02a 100644
--- a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp
@@ -100,3 +100,5 @@ QQmlListProperty<QLayer> Quick3DLayerFilter::qmlLayers()
 } // Qt3D
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dlayerfilter_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3dmaterial.cpp b/src/quick3d/quick3drender/items/quick3dmaterial.cpp
index 0e1528fe2..50e7afe45 100644
--- a/src/quick3d/quick3drender/items/quick3dmaterial.cpp
+++ b/src/quick3d/quick3drender/items/quick3dmaterial.cpp
@@ -101,3 +101,5 @@ QQmlListProperty<QParameter> Quick3DMaterial::qmlParameters()
 } // Qt3D
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dmaterial_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3dmemorybarrier.cpp b/src/quick3d/quick3drender/items/quick3dmemorybarrier.cpp
index 0754a0cf5..504ff3af9 100644
--- a/src/quick3d/quick3drender/items/quick3dmemorybarrier.cpp
+++ b/src/quick3d/quick3drender/items/quick3dmemorybarrier.cpp
@@ -72,3 +72,5 @@ int Quick3DMemoryBarrier::waitFor() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dmemorybarrier_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3dparameter.cpp b/src/quick3d/quick3drender/items/quick3dparameter.cpp
index 2ef95a4d4..a4e6178e1 100644
--- a/src/quick3d/quick3drender/items/quick3dparameter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dparameter.cpp
@@ -85,4 +85,6 @@ Quick3DParameter::Quick3DParameter(Quick3DParameterPrivate &dd, QNode *parent)
 
 QT_END_NAMESPACE
 
+#include "moc_quick3dparameter_p.cpp"
+
 
diff --git a/src/quick3d/quick3drender/items/quick3draycaster.cpp b/src/quick3d/quick3drender/items/quick3draycaster.cpp
index 4e901c82b..d227ff0ce 100644
--- a/src/quick3d/quick3drender/items/quick3draycaster.cpp
+++ b/src/quick3d/quick3drender/items/quick3draycaster.cpp
@@ -97,3 +97,5 @@ QQmlListProperty<Qt3DRender::QLayer> Qt3DRender::Render::Quick::Quick3DRayCaster
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_quick3draycaster_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3drenderpass.cpp b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
index 0006191a5..49887f4d7 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpass.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpass.cpp
@@ -149,3 +149,5 @@ QQmlListProperty<QParameter> Quick3DRenderPass::parameterList()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_quick3drenderpass_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
index 6323911b4..7974ba81e 100644
--- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp
@@ -132,3 +132,5 @@ QQmlListProperty<QParameter> Quick3DRenderPassFilter::parameterList()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_quick3drenderpassfilter_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
index 810ded8b0..87cd2be29 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
@@ -93,3 +93,5 @@ QQmlListProperty<QRenderTargetOutput> Quick3DRenderTargetOutput::qmlAttachments(
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_quick3drendertargetoutput_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3dscene.cpp b/src/quick3d/quick3drender/items/quick3dscene.cpp
index af4f44f0e..d118fa51d 100644
--- a/src/quick3d/quick3drender/items/quick3dscene.cpp
+++ b/src/quick3d/quick3drender/items/quick3dscene.cpp
@@ -55,3 +55,5 @@ Quick3DScene::Quick3DScene(QObject *parent)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dscene_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3dscreenraycaster.cpp b/src/quick3d/quick3drender/items/quick3dscreenraycaster.cpp
index 206073426..5023bd197 100644
--- a/src/quick3d/quick3drender/items/quick3dscreenraycaster.cpp
+++ b/src/quick3d/quick3drender/items/quick3dscreenraycaster.cpp
@@ -101,3 +101,5 @@ QQmlListProperty<Qt3DRender::QLayer> Qt3DRender::Render::Quick::Quick3DScreenRay
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dscreenraycaster_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
index 539391da9..0cc669e44 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdata.cpp
@@ -104,3 +104,5 @@ Quick3DShaderData::Quick3DShaderData(QNode *parent)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dshaderdata_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
index 146a17477..868546c2e 100644
--- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
+++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp
@@ -110,3 +110,5 @@ QList<QShaderData *> Quick3DShaderDataArray::values() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dshaderdataarray_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3dstateset.cpp b/src/quick3d/quick3drender/items/quick3dstateset.cpp
index 396fab309..252c793ca 100644
--- a/src/quick3d/quick3drender/items/quick3dstateset.cpp
+++ b/src/quick3d/quick3drender/items/quick3dstateset.cpp
@@ -91,3 +91,5 @@ QQmlListProperty<QRenderState> Quick3DStateSet::renderStateList()
 
 QT_END_NAMESPACE
 
+#include "moc_quick3dstateset_p.cpp"
+
diff --git a/src/quick3d/quick3drender/items/quick3dtechnique.cpp b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
index edc6f3da2..380f9f3a0 100644
--- a/src/quick3d/quick3drender/items/quick3dtechnique.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp
@@ -165,3 +165,5 @@ QQmlListProperty<QFilterKey> Quick3DTechnique::filterKeyList()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dtechnique_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
index 0de7fe5ba..645206d20 100644
--- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp
@@ -126,3 +126,5 @@ QQmlListProperty<QParameter> Quick3DTechniqueFilter::parameterList()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dtechniquefilter_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3dtexture.cpp b/src/quick3d/quick3drender/items/quick3dtexture.cpp
index 8e1deed1c..d2d75edb9 100644
--- a/src/quick3d/quick3drender/items/quick3dtexture.cpp
+++ b/src/quick3d/quick3drender/items/quick3dtexture.cpp
@@ -94,3 +94,5 @@ QQmlListProperty<QAbstractTextureImage> Quick3DTextureExtension::textureImages()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dtexture_p.cpp"
diff --git a/src/quick3d/quick3drender/items/quick3dviewport.cpp b/src/quick3d/quick3drender/items/quick3dviewport.cpp
index 3b4bf33f5..855b631eb 100644
--- a/src/quick3d/quick3drender/items/quick3dviewport.cpp
+++ b/src/quick3d/quick3drender/items/quick3dviewport.cpp
@@ -55,3 +55,5 @@ Quick3DViewport::Quick3DViewport(QObject *parent)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_quick3dviewport_p.cpp"
diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.cpp b/src/quick3d/quick3dscene2d/items/qscene2d.cpp
index 55aba62ad..993a5ecfd 100644
--- a/src/quick3d/quick3dscene2d/items/qscene2d.cpp
+++ b/src/quick3d/quick3dscene2d/items/qscene2d.cpp
@@ -349,3 +349,5 @@ void QScene2D::setMouseEnabled(bool enabled)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qscene2d.cpp"
diff --git a/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp b/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp
index 5b8ee1896..4c5ab90d2 100644
--- a/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp
+++ b/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp
@@ -96,3 +96,5 @@ QQmlListProperty<Qt3DCore::QEntity> QQuick3DScene2D::entities()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qt3dquick3dscene2d_p.cpp"
diff --git a/src/quick3d/quick3dscene2d/items/scene2d.cpp b/src/quick3d/quick3dscene2d/items/scene2d.cpp
index 2ad32e755..c2ca79df3 100644
--- a/src/quick3d/quick3dscene2d/items/scene2d.cpp
+++ b/src/quick3d/quick3dscene2d/items/scene2d.cpp
@@ -503,3 +503,5 @@ void Scene2D::handlePickEvent(int type, const Qt3DRender::QPickEvent *ev)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_scene2d_p.cpp"
diff --git a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp
index f4ec3aec8..65dbf2a98 100644
--- a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp
+++ b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp
@@ -258,3 +258,5 @@ void Scene2DManager::cleanup()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_scene2dmanager_p.cpp"
diff --git a/src/render/backend/offscreensurfacehelper.cpp b/src/render/backend/offscreensurfacehelper.cpp
index 38558d484..60c80d7b5 100644
--- a/src/render/backend/offscreensurfacehelper.cpp
+++ b/src/render/backend/offscreensurfacehelper.cpp
@@ -80,3 +80,5 @@ void OffscreenSurfaceHelper::createOffscreenSurface()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_offscreensurfacehelper_p.cpp"
diff --git a/src/render/backend/platformsurfacefilter.cpp b/src/render/backend/platformsurfacefilter.cpp
index 115fb637f..8004bf2e4 100644
--- a/src/render/backend/platformsurfacefilter.cpp
+++ b/src/render/backend/platformsurfacefilter.cpp
@@ -168,3 +168,5 @@ bool SurfaceLocker::isSurfaceValid() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_platformsurfacefilter_p.cpp"
diff --git a/src/render/backend/uniform_p.h b/src/render/backend/uniform_p.h
index 24bbcd76c..8dedf6d63 100644
--- a/src/render/backend/uniform_p.h
+++ b/src/render/backend/uniform_p.h
@@ -58,6 +58,7 @@
 #include <Qt3DCore/private/vector4d_p.h>
 #include <Qt3DRender/private/qt3drender_global_p.h>
 #include <QMatrix4x4>
+#include <QVarLengthArray>
 #include <QVector2D>
 #include <QVector3D>
 #include <QColor>
diff --git a/src/render/framegraph/qblitframebuffer.cpp b/src/render/framegraph/qblitframebuffer.cpp
index 356b2db06..2e9f9a2c3 100644
--- a/src/render/framegraph/qblitframebuffer.cpp
+++ b/src/render/framegraph/qblitframebuffer.cpp
@@ -435,3 +435,5 @@ void QBlitFramebuffer::setInterpolationMethod(QBlitFramebuffer::InterpolationMet
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qblitframebuffer.cpp"
diff --git a/src/render/framegraph/qbuffercapture.cpp b/src/render/framegraph/qbuffercapture.cpp
index 49b923534..3c18e31ba 100644
--- a/src/render/framegraph/qbuffercapture.cpp
+++ b/src/render/framegraph/qbuffercapture.cpp
@@ -81,3 +81,5 @@ QBufferCapture::~QBufferCapture()
 } //Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qbuffercapture.cpp"
diff --git a/src/render/framegraph/qcameraselector.cpp b/src/render/framegraph/qcameraselector.cpp
index f9deba592..dec88c392 100644
--- a/src/render/framegraph/qcameraselector.cpp
+++ b/src/render/framegraph/qcameraselector.cpp
@@ -141,3 +141,5 @@ Qt3DCore::QEntity *QCameraSelector::camera() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qcameraselector.cpp"
diff --git a/src/render/framegraph/qclearbuffers.cpp b/src/render/framegraph/qclearbuffers.cpp
index 177f6f097..f24a46874 100644
--- a/src/render/framegraph/qclearbuffers.cpp
+++ b/src/render/framegraph/qclearbuffers.cpp
@@ -234,3 +234,5 @@ void QClearBuffers::setColorBuffer(QRenderTargetOutput *buffer)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qclearbuffers.cpp"
diff --git a/src/render/framegraph/qdebugoverlay.cpp b/src/render/framegraph/qdebugoverlay.cpp
index da0401b1b..ad7ddc1f4 100644
--- a/src/render/framegraph/qdebugoverlay.cpp
+++ b/src/render/framegraph/qdebugoverlay.cpp
@@ -97,3 +97,5 @@ QDebugOverlay::QDebugOverlay(Qt3DCore::QNode *parent)
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qdebugoverlay.cpp"
diff --git a/src/render/framegraph/qdispatchcompute.cpp b/src/render/framegraph/qdispatchcompute.cpp
index f9d1df621..13498e50e 100644
--- a/src/render/framegraph/qdispatchcompute.cpp
+++ b/src/render/framegraph/qdispatchcompute.cpp
@@ -165,3 +165,5 @@ void QDispatchCompute::setWorkGroupZ(int workGroupZ)
 
 QT_END_NAMESPACE
 
+#include "moc_qdispatchcompute.cpp"
+
diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp
index 2a2bda3f2..3b1a7c902 100644
--- a/src/render/framegraph/qframegraphnode.cpp
+++ b/src/render/framegraph/qframegraphnode.cpp
@@ -435,3 +435,5 @@ void QFrameGraphNode::onParentChanged(QObject *)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qframegraphnode.cpp"
diff --git a/src/render/framegraph/qfrustumculling.cpp b/src/render/framegraph/qfrustumculling.cpp
index c34d666b5..d86044725 100644
--- a/src/render/framegraph/qfrustumculling.cpp
+++ b/src/render/framegraph/qfrustumculling.cpp
@@ -96,3 +96,5 @@ QFrustumCulling::~QFrustumCulling()
 
 QT_END_NAMESPACE
 
+#include "moc_qfrustumculling.cpp"
+
diff --git a/src/render/framegraph/qlayerfilter.cpp b/src/render/framegraph/qlayerfilter.cpp
index d7285fad0..e4eab2261 100644
--- a/src/render/framegraph/qlayerfilter.cpp
+++ b/src/render/framegraph/qlayerfilter.cpp
@@ -247,3 +247,5 @@ void QLayerFilter::setFilterMode(QLayerFilter::FilterMode filterMode)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qlayerfilter.cpp"
diff --git a/src/render/framegraph/qmemorybarrier.cpp b/src/render/framegraph/qmemorybarrier.cpp
index 1b44fac79..77b5602ea 100644
--- a/src/render/framegraph/qmemorybarrier.cpp
+++ b/src/render/framegraph/qmemorybarrier.cpp
@@ -157,3 +157,5 @@ QMemoryBarrier::QMemoryBarrier(QMemoryBarrierPrivate &dd, Qt3DCore::QNode *paren
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qmemorybarrier.cpp"
diff --git a/src/render/framegraph/qnodraw.cpp b/src/render/framegraph/qnodraw.cpp
index 46756557e..bd77727ed 100644
--- a/src/render/framegraph/qnodraw.cpp
+++ b/src/render/framegraph/qnodraw.cpp
@@ -140,3 +140,5 @@ QNoDraw::~QNoDraw()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qnodraw.cpp"
diff --git a/src/render/framegraph/qnopicking.cpp b/src/render/framegraph/qnopicking.cpp
index 069560175..f7bfe6d47 100644
--- a/src/render/framegraph/qnopicking.cpp
+++ b/src/render/framegraph/qnopicking.cpp
@@ -137,3 +137,5 @@ QNoPicking::~QNoPicking()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qnopicking.cpp"
diff --git a/src/render/framegraph/qproximityfilter.cpp b/src/render/framegraph/qproximityfilter.cpp
index 6836956a4..f17eee20c 100644
--- a/src/render/framegraph/qproximityfilter.cpp
+++ b/src/render/framegraph/qproximityfilter.cpp
@@ -183,3 +183,5 @@ void QProximityFilter::setDistanceThreshold(float distanceThreshold)
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qproximityfilter.cpp"
diff --git a/src/render/framegraph/qrendercapture.cpp b/src/render/framegraph/qrendercapture.cpp
index 97a71cbed..cac563549 100644
--- a/src/render/framegraph/qrendercapture.cpp
+++ b/src/render/framegraph/qrendercapture.cpp
@@ -351,3 +351,5 @@ Qt3DRender::QRenderCaptureReply *QRenderCapture::requestCapture()
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qrendercapture.cpp"
diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp
index 378ff63a6..44fa91a02 100644
--- a/src/render/framegraph/qrenderpassfilter.cpp
+++ b/src/render/framegraph/qrenderpassfilter.cpp
@@ -211,3 +211,5 @@ QList<QParameter *> QRenderPassFilter::parameters() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qrenderpassfilter.cpp"
diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp
index 6e8700695..ba499f919 100644
--- a/src/render/framegraph/qrenderstateset.cpp
+++ b/src/render/framegraph/qrenderstateset.cpp
@@ -221,3 +221,5 @@ QList<QRenderState *> QRenderStateSet::renderStates() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qrenderstateset.cpp"
diff --git a/src/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp
index 3b8eb0ae8..c0d0fb8aa 100644
--- a/src/render/framegraph/qrendersurfaceselector.cpp
+++ b/src/render/framegraph/qrendersurfaceselector.cpp
@@ -256,7 +256,7 @@ void QRenderSurfaceSelector::setSurface(QObject *surfaceObject)
                 d->m_heightConn = QObject::connect(window, &QWindow::heightChanged, [=] (int) {
                     d->update();
                 });
-                d->m_screenConn = QObject::connect(window, &QWindow::screenChanged, [=] (QScreen *screen) {
+                d->m_screenConn = QObject::connect(window, &QWindow::screenChanged, [this] (QScreen *screen) {
                     if (screen && !qFuzzyCompare(surfacePixelRatio(), float(screen->devicePixelRatio())))
                         setSurfacePixelRatio(float(screen->devicePixelRatio()));
                 });
@@ -317,3 +317,5 @@ void QRenderSurfaceSelector::setExternalRenderTargetSize(const QSize &size)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qrendersurfaceselector.cpp"
diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp
index 5004df234..9f38602d7 100644
--- a/src/render/framegraph/qrendertargetselector.cpp
+++ b/src/render/framegraph/qrendertargetselector.cpp
@@ -137,3 +137,5 @@ QRenderTargetSelector::QRenderTargetSelector(QRenderTargetSelectorPrivate &dd, Q
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qrendertargetselector.cpp"
diff --git a/src/render/framegraph/qsetfence.cpp b/src/render/framegraph/qsetfence.cpp
index ae25ba80f..1583c30e9 100644
--- a/src/render/framegraph/qsetfence.cpp
+++ b/src/render/framegraph/qsetfence.cpp
@@ -151,3 +151,5 @@ void QSetFencePrivate::setHandle(QVariant handle)
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qsetfence.cpp"
diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp
index d3d7fe58f..0d4e65474 100644
--- a/src/render/framegraph/qsortpolicy.cpp
+++ b/src/render/framegraph/qsortpolicy.cpp
@@ -189,3 +189,5 @@ void QSortPolicy::setSortTypes(const QList<int> &sortTypesInt)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qsortpolicy.cpp"
diff --git a/src/render/framegraph/qsubtreeenabler.cpp b/src/render/framegraph/qsubtreeenabler.cpp
index d37cc37e8..422aa8eb2 100644
--- a/src/render/framegraph/qsubtreeenabler.cpp
+++ b/src/render/framegraph/qsubtreeenabler.cpp
@@ -173,3 +173,5 @@ void QSubtreeEnabler::requestUpdate()
 } //Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qsubtreeenabler.cpp"
diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp
index 8bcc8af0f..02a6b8e11 100644
--- a/src/render/framegraph/qtechniquefilter.cpp
+++ b/src/render/framegraph/qtechniquefilter.cpp
@@ -213,3 +213,5 @@ QList<QParameter *> QTechniqueFilter::parameters() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qtechniquefilter.cpp"
diff --git a/src/render/framegraph/qviewport.cpp b/src/render/framegraph/qviewport.cpp
index fa04c647a..4ee1bf372 100644
--- a/src/render/framegraph/qviewport.cpp
+++ b/src/render/framegraph/qviewport.cpp
@@ -156,3 +156,5 @@ void QViewport::setGamma(float gamma)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qviewport.cpp"
diff --git a/src/render/framegraph/qwaitfence.cpp b/src/render/framegraph/qwaitfence.cpp
index 4cd1bea61..e626b17d3 100644
--- a/src/render/framegraph/qwaitfence.cpp
+++ b/src/render/framegraph/qwaitfence.cpp
@@ -204,3 +204,5 @@ void QWaitFence::setHandle(QVariant handle)
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qwaitfence.cpp"
diff --git a/src/render/frontend/qcamera.cpp b/src/render/frontend/qcamera.cpp
index 4d4e5bf4d..c721ee728 100644
--- a/src/render/frontend/qcamera.cpp
+++ b/src/render/frontend/qcamera.cpp
@@ -1127,3 +1127,5 @@ QMatrix4x4 QCamera::viewMatrix() const
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qcamera.cpp"
diff --git a/src/render/frontend/qcameralens.cpp b/src/render/frontend/qcameralens.cpp
index a7b1d8be6..4669c17aa 100644
--- a/src/render/frontend/qcameralens.cpp
+++ b/src/render/frontend/qcameralens.cpp
@@ -620,3 +620,5 @@ float QCameraLens::exposure() const
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qcameralens.cpp"
diff --git a/src/render/frontend/qcomputecommand.cpp b/src/render/frontend/qcomputecommand.cpp
index 9dda7f596..e2db004eb 100644
--- a/src/render/frontend/qcomputecommand.cpp
+++ b/src/render/frontend/qcomputecommand.cpp
@@ -279,3 +279,5 @@ void QComputeCommand::trigger(int workGroupX, int workGroupY, int workGroupZ, in
 } // Render
 
 QT_END_NAMESPACE
+
+#include "moc_qcomputecommand.cpp"
diff --git a/src/render/frontend/qlayer.cpp b/src/render/frontend/qlayer.cpp
index 61fdbf4b3..c8b1d3007 100644
--- a/src/render/frontend/qlayer.cpp
+++ b/src/render/frontend/qlayer.cpp
@@ -190,3 +190,5 @@ QLayer::QLayer(QLayerPrivate &dd, QNode *parent)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qlayer.cpp"
diff --git a/src/render/frontend/qlevelofdetailboundingsphere.cpp b/src/render/frontend/qlevelofdetailboundingsphere.cpp
index 8354365d8..ce9688e38 100644
--- a/src/render/frontend/qlevelofdetailboundingsphere.cpp
+++ b/src/render/frontend/qlevelofdetailboundingsphere.cpp
@@ -155,3 +155,5 @@ bool QLevelOfDetailBoundingSphere::operator !=(const QLevelOfDetailBoundingSpher
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qlevelofdetailboundingsphere.cpp"
diff --git a/src/render/frontend/qlevelofdetailswitch.cpp b/src/render/frontend/qlevelofdetailswitch.cpp
index c0bbdc0f8..5220eb006 100644
--- a/src/render/frontend/qlevelofdetailswitch.cpp
+++ b/src/render/frontend/qlevelofdetailswitch.cpp
@@ -136,3 +136,5 @@ QLevelOfDetailSwitch::QLevelOfDetailSwitch(QLevelOfDetailPrivate &dd, QNode *par
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qlevelofdetailswitch.cpp"
diff --git a/src/render/frontend/qpickingsettings.cpp b/src/render/frontend/qpickingsettings.cpp
index 0c858aef2..e176f0329 100644
--- a/src/render/frontend/qpickingsettings.cpp
+++ b/src/render/frontend/qpickingsettings.cpp
@@ -308,3 +308,5 @@ void QPickingSettings::setWorldSpaceTolerance(float worldSpaceTolerance)
 } // namespace Qt3Drender
 
 QT_END_NAMESPACE
+
+#include "moc_qpickingsettings.cpp"
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index 2bc31506f..0c0851a97 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -1010,3 +1010,5 @@ void QRenderAspectPrivate::configurePlugin(const QString &plugin)
 QT_END_NAMESPACE
 
 QT3D_REGISTER_NAMESPACED_ASPECT("render", QT_PREPEND_NAMESPACE(Qt3DRender), QRenderAspect)
+
+#include "moc_qrenderaspect.cpp"
diff --git a/src/render/frontend/qrendercapabilities.cpp b/src/render/frontend/qrendercapabilities.cpp
index afe5d04a8..f1b8dfefb 100644
--- a/src/render/frontend/qrendercapabilities.cpp
+++ b/src/render/frontend/qrendercapabilities.cpp
@@ -876,3 +876,5 @@ int QRenderCapabilities::maxComputeSharedMemorySize() const
 } // namespace Qt3Drender
 
 QT_END_NAMESPACE
+
+#include "moc_qrendercapabilities.cpp"
diff --git a/src/render/frontend/qrenderpluginfactoryif.cpp b/src/render/frontend/qrenderpluginfactoryif.cpp
index 2bdd39090..00620fcf5 100644
--- a/src/render/frontend/qrenderpluginfactoryif.cpp
+++ b/src/render/frontend/qrenderpluginfactoryif.cpp
@@ -66,3 +66,5 @@ QRenderPlugin *QRenderPluginFactoryIf::create(const QString &key, const QStringL
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qrenderpluginfactoryif_p.cpp"
diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp
index 1abc0fca6..65f0fc005 100644
--- a/src/render/frontend/qrendertarget.cpp
+++ b/src/render/frontend/qrendertarget.cpp
@@ -153,3 +153,5 @@ QList<QRenderTargetOutput *> QRenderTarget::outputs() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qrendertarget.cpp"
diff --git a/src/render/frontend/qrendertargetoutput.cpp b/src/render/frontend/qrendertargetoutput.cpp
index 9d6600233..f5f811503 100644
--- a/src/render/frontend/qrendertargetoutput.cpp
+++ b/src/render/frontend/qrendertargetoutput.cpp
@@ -303,3 +303,5 @@ QAbstractTexture::CubeMapFace QRenderTargetOutput::face() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qrendertargetoutput.cpp"
diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp
index f11405e3f..ea7e47abd 100644
--- a/src/render/geometry/qgeometryrenderer.cpp
+++ b/src/render/geometry/qgeometryrenderer.cpp
@@ -556,3 +556,5 @@ void QGeometryRenderer::setSortIndex(float sortIndex)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qgeometryrenderer.cpp"
diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp
index 9bcad868d..ae017b51d 100644
--- a/src/render/geometry/qmesh.cpp
+++ b/src/render/geometry/qmesh.cpp
@@ -442,3 +442,5 @@ void MeshDownloadRequest::onCompleted()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qmesh.cpp"
diff --git a/src/render/geometry/qpickingproxy.cpp b/src/render/geometry/qpickingproxy.cpp
index d9c2d264e..0427170af 100644
--- a/src/render/geometry/qpickingproxy.cpp
+++ b/src/render/geometry/qpickingproxy.cpp
@@ -154,3 +154,5 @@ QPickingProxy::QPickingProxy(QPickingProxyPrivate &dd, QNode *parent)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qpickingproxy.cpp"
diff --git a/src/render/io/qgeometryloaderfactory.cpp b/src/render/io/qgeometryloaderfactory.cpp
index c34469dc1..d33fa8ae3 100644
--- a/src/render/io/qgeometryloaderfactory.cpp
+++ b/src/render/io/qgeometryloaderfactory.cpp
@@ -56,3 +56,5 @@ QGeometryLoaderFactory::~QGeometryLoaderFactory()
 
 QT_END_NAMESPACE
 
+#include "moc_qgeometryloaderfactory_p.cpp"
+
diff --git a/src/render/io/qsceneexporter.cpp b/src/render/io/qsceneexporter.cpp
index 71a0120c0..fcc9f93c0 100644
--- a/src/render/io/qsceneexporter.cpp
+++ b/src/render/io/qsceneexporter.cpp
@@ -72,3 +72,5 @@ void QSceneExporter::logInfo(const QString &info)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qsceneexporter_p.cpp"
diff --git a/src/render/io/qsceneexportplugin.cpp b/src/render/io/qsceneexportplugin.cpp
index 9ba2a6298..fa0232aef 100644
--- a/src/render/io/qsceneexportplugin.cpp
+++ b/src/render/io/qsceneexportplugin.cpp
@@ -64,3 +64,5 @@ QSceneExporter *QSceneExportPlugin::create(const QString &key, const QStringList
 
 QT_END_NAMESPACE
 
+#include "moc_qsceneexportplugin_p.cpp"
+
diff --git a/src/render/io/qsceneimporter.cpp b/src/render/io/qsceneimporter.cpp
index f58a435eb..8c8633eea 100644
--- a/src/render/io/qsceneimporter.cpp
+++ b/src/render/io/qsceneimporter.cpp
@@ -86,3 +86,5 @@ void QSceneImporter::logInfo(const QString &info)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qsceneimporter_p.cpp"
diff --git a/src/render/io/qsceneimportplugin.cpp b/src/render/io/qsceneimportplugin.cpp
index 8cafdd25a..37b2a7f07 100644
--- a/src/render/io/qsceneimportplugin.cpp
+++ b/src/render/io/qsceneimportplugin.cpp
@@ -64,3 +64,5 @@ QSceneImporter *QSceneImportPlugin::create(const QString &key, const QStringList
 
 QT_END_NAMESPACE
 
+#include "moc_qsceneimportplugin_p.cpp"
+
diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp
index 5dd690b49..cbbda235d 100644
--- a/src/render/io/qsceneloader.cpp
+++ b/src/render/io/qsceneloader.cpp
@@ -373,3 +373,5 @@ QComponent *QSceneLoader::component(const QString &entityName,
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qsceneloader.cpp"
diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp
index 83ac9e28b..3a8df3df0 100644
--- a/src/render/lights/qabstractlight.cpp
+++ b/src/render/lights/qabstractlight.cpp
@@ -175,3 +175,5 @@ void QAbstractLight::setIntensity(float value)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qabstractlight.cpp"
diff --git a/src/render/lights/qdirectionallight.cpp b/src/render/lights/qdirectionallight.cpp
index 51827b644..1ab43704c 100644
--- a/src/render/lights/qdirectionallight.cpp
+++ b/src/render/lights/qdirectionallight.cpp
@@ -146,3 +146,5 @@ QVector3D QDirectionalLight::worldDirection() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qdirectionallight.cpp"
diff --git a/src/render/lights/qpointlight.cpp b/src/render/lights/qpointlight.cpp
index c16291709..2a14a2d40 100644
--- a/src/render/lights/qpointlight.cpp
+++ b/src/render/lights/qpointlight.cpp
@@ -226,3 +226,5 @@ void QPointLight::setQuadraticAttenuation(float value)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qpointlight.cpp"
diff --git a/src/render/lights/qspotlight.cpp b/src/render/lights/qspotlight.cpp
index c725a6baf..5b650dfe0 100644
--- a/src/render/lights/qspotlight.cpp
+++ b/src/render/lights/qspotlight.cpp
@@ -292,3 +292,5 @@ void QSpotLight::setCutOffAngle(float value)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qspotlight.cpp"
diff --git a/src/render/materialsystem/filterkey.cpp b/src/render/materialsystem/filterkey.cpp
index 778a9ee75..572d11e57 100644
--- a/src/render/materialsystem/filterkey.cpp
+++ b/src/render/materialsystem/filterkey.cpp
@@ -83,7 +83,7 @@ void FilterKey::syncFromFrontEnd(const QNode *frontEnd, bool firstTime)
     }
 }
 
-bool FilterKey::operator ==(const FilterKey &other)
+bool FilterKey::equals(const FilterKey &other) const
 {
     if (&other == this)
         return true;
@@ -101,11 +101,6 @@ bool FilterKey::operator ==(const FilterKey &other)
             other.value() == value());
 }
 
-bool FilterKey::operator !=(const FilterKey &other)
-{
-    return !operator ==(other);
-}
-
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/render/materialsystem/filterkey_p.h b/src/render/materialsystem/filterkey_p.h
index 91d0ba1f0..1fe6bba7b 100644
--- a/src/render/materialsystem/filterkey_p.h
+++ b/src/render/materialsystem/filterkey_p.h
@@ -72,10 +72,15 @@ public:
     const QVariant &value() const { return m_value; }
     const QString &name() const { return m_name; }
     void syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firstTime) override;
-    bool operator ==(const FilterKey &other);
-    bool operator !=(const FilterKey &other);
+
+    friend bool operator==(const FilterKey &lhs, const FilterKey &rhs)
+    { return lhs.equals(rhs); }
+    friend bool operator !=(const FilterKey &lhs, const FilterKey &rhs)
+    { return !lhs.equals(rhs); }
 
 private:
+    bool equals(const FilterKey &other) const;
+
     QVariant m_value;
     QString m_name;
 };
diff --git a/src/render/materialsystem/qeffect.cpp b/src/render/materialsystem/qeffect.cpp
index 2baeb4512..ebed36dd5 100644
--- a/src/render/materialsystem/qeffect.cpp
+++ b/src/render/materialsystem/qeffect.cpp
@@ -121,7 +121,7 @@ QEffectPrivate::QEffectPrivate()
     Effect {
         id: effect
 
-        technique: [
+        techniques: [
             Technique {
                 id: gl3Technique
                 graphicsApiFilter {
@@ -270,3 +270,5 @@ QList<QTechnique *> QEffect::techniques() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qeffect.cpp"
diff --git a/src/render/materialsystem/qfilterkey.cpp b/src/render/materialsystem/qfilterkey.cpp
index a98dc2b4f..981e66521 100644
--- a/src/render/materialsystem/qfilterkey.cpp
+++ b/src/render/materialsystem/qfilterkey.cpp
@@ -145,3 +145,5 @@ QString QFilterKey::name() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qfilterkey.cpp"
diff --git a/src/render/materialsystem/qgraphicsapifilter.cpp b/src/render/materialsystem/qgraphicsapifilter.cpp
index ae85af6b2..9d998efcc 100644
--- a/src/render/materialsystem/qgraphicsapifilter.cpp
+++ b/src/render/materialsystem/qgraphicsapifilter.cpp
@@ -373,3 +373,5 @@ bool operator !=(const QGraphicsApiFilter &reference, const QGraphicsApiFilter &
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qgraphicsapifilter.cpp"
diff --git a/src/render/materialsystem/qmaterial.cpp b/src/render/materialsystem/qmaterial.cpp
index 7111dba23..8c85d7293 100644
--- a/src/render/materialsystem/qmaterial.cpp
+++ b/src/render/materialsystem/qmaterial.cpp
@@ -73,7 +73,7 @@
     Effect {
         id: effect
 
-        technique: [
+        techniques: [
             Technique {
                 id: gl3Technique
                 graphicsApiFilter {
@@ -302,3 +302,5 @@ QList<QParameter *> QMaterial::parameters() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qmaterial.cpp"
diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp
index fc74155dc..14d67be8f 100644
--- a/src/render/materialsystem/qparameter.cpp
+++ b/src/render/materialsystem/qparameter.cpp
@@ -326,3 +326,5 @@ QVariant QParameter::value() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qparameter.cpp"
diff --git a/src/render/materialsystem/qrenderpass.cpp b/src/render/materialsystem/qrenderpass.cpp
index 282324915..242c070ae 100644
--- a/src/render/materialsystem/qrenderpass.cpp
+++ b/src/render/materialsystem/qrenderpass.cpp
@@ -401,3 +401,5 @@ ParameterList QRenderPass::parameters() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qrenderpass.cpp"
diff --git a/src/render/materialsystem/qshaderdata.cpp b/src/render/materialsystem/qshaderdata.cpp
index 34aee02fb..1620b3578 100644
--- a/src/render/materialsystem/qshaderdata.cpp
+++ b/src/render/materialsystem/qshaderdata.cpp
@@ -134,3 +134,5 @@ bool QShaderData::event(QEvent *event)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qshaderdata.cpp"
diff --git a/src/render/materialsystem/qshaderimage.cpp b/src/render/materialsystem/qshaderimage.cpp
index d8bcb41ac..f34732a0d 100644
--- a/src/render/materialsystem/qshaderimage.cpp
+++ b/src/render/materialsystem/qshaderimage.cpp
@@ -974,3 +974,5 @@ void QShaderImage::setFormat(QShaderImage::ImageFormat format)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qshaderimage.cpp"
diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp
index a43ddba9e..21c7303b6 100644
--- a/src/render/materialsystem/qshaderprogram.cpp
+++ b/src/render/materialsystem/qshaderprogram.cpp
@@ -974,3 +974,5 @@ QByteArray QShaderProgram::loadSource(const QUrl &sourceUrl)
 } // of namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qshaderprogram.cpp"
diff --git a/src/render/materialsystem/qshaderprogrambuilder.cpp b/src/render/materialsystem/qshaderprogrambuilder.cpp
index ed08af56f..75827df36 100644
--- a/src/render/materialsystem/qshaderprogrambuilder.cpp
+++ b/src/render/materialsystem/qshaderprogrambuilder.cpp
@@ -493,3 +493,5 @@ QByteArray QShaderProgramBuilder::computeShaderCode() const
 } // of namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qshaderprogrambuilder.cpp"
diff --git a/src/render/picking/pickeventfilter.cpp b/src/render/picking/pickeventfilter.cpp
index a41ed6c1e..7c87ba7bf 100644
--- a/src/render/picking/pickeventfilter.cpp
+++ b/src/render/picking/pickeventfilter.cpp
@@ -96,3 +96,5 @@ bool PickEventFilter::eventFilter(QObject *obj, QEvent *e)
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_pickeventfilter_p.cpp"
diff --git a/src/render/picking/qabstractraycaster.cpp b/src/render/picking/qabstractraycaster.cpp
index 473a0d3e3..568ba59ff 100644
--- a/src/render/picking/qabstractraycaster.cpp
+++ b/src/render/picking/qabstractraycaster.cpp
@@ -386,3 +386,5 @@ QList<QLayer *> QAbstractRayCaster::layers() const
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qabstractraycaster.cpp"
diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp
index 498b0d97a..8f00d2c4d 100644
--- a/src/render/picking/qobjectpicker.cpp
+++ b/src/render/picking/qobjectpicker.cpp
@@ -124,14 +124,6 @@ namespace Qt3DRender {
  */
 
 /*!
-    \qmlsignal Qt3D.Render::ObjectPicker::clicked(PickEvent pick)
-
-    This signal is emitted when the bounding volume defined by the pickAttribute
-    property intersects with a ray on a mouse click the PickEvent \a pick contains
-    details of the event.
-*/
-
-/*!
     \qmlsignal Qt3D.Render::ObjectPicker::pressed(PickEvent pick)
 
     This signal is emitted when the bounding volume defined by the
@@ -476,3 +468,5 @@ void QObjectPickerPrivate::releasedEvent(QPickEvent *event)
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qobjectpicker.cpp"
diff --git a/src/render/picking/qpickevent.cpp b/src/render/picking/qpickevent.cpp
index ae5748082..180925faf 100644
--- a/src/render/picking/qpickevent.cpp
+++ b/src/render/picking/qpickevent.cpp
@@ -353,3 +353,5 @@ Qt3DCore::QEntity *QPickEvent::entity() const
 
 QT_END_NAMESPACE
 
+#include "moc_qpickevent.cpp"
+
diff --git a/src/render/picking/qpicklineevent.cpp b/src/render/picking/qpicklineevent.cpp
index a079fb557..50b8e7803 100644
--- a/src/render/picking/qpicklineevent.cpp
+++ b/src/render/picking/qpicklineevent.cpp
@@ -171,3 +171,5 @@ uint QPickLineEvent::vertex2Index() const
 
 QT_END_NAMESPACE
 
+#include "moc_qpicklineevent.cpp"
+
diff --git a/src/render/picking/qpickpointevent.cpp b/src/render/picking/qpickpointevent.cpp
index 2e035d3f2..76680ff92 100644
--- a/src/render/picking/qpickpointevent.cpp
+++ b/src/render/picking/qpickpointevent.cpp
@@ -129,3 +129,5 @@ uint QPickPointEvent::pointIndex() const
 
 QT_END_NAMESPACE
 
+#include "moc_qpickpointevent.cpp"
+
diff --git a/src/render/picking/qpicktriangleevent.cpp b/src/render/picking/qpicktriangleevent.cpp
index b33c7c0dd..e5ae699b6 100644
--- a/src/render/picking/qpicktriangleevent.cpp
+++ b/src/render/picking/qpicktriangleevent.cpp
@@ -273,3 +273,5 @@ QVector3D QPickTriangleEvent::uvw() const
 
 QT_END_NAMESPACE
 
+#include "moc_qpicktriangleevent.cpp"
+
diff --git a/src/render/picking/qraycaster.cpp b/src/render/picking/qraycaster.cpp
index 1f418b4c8..c31a8f1b6 100644
--- a/src/render/picking/qraycaster.cpp
+++ b/src/render/picking/qraycaster.cpp
@@ -216,3 +216,5 @@ QAbstractRayCaster::Hits QRayCaster::pick(const QVector3D &origin, const QVector
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qraycaster.cpp"
diff --git a/src/render/picking/qraycasterhit.cpp b/src/render/picking/qraycasterhit.cpp
index 1a253dfb5..a1a6faad3 100644
--- a/src/render/picking/qraycasterhit.cpp
+++ b/src/render/picking/qraycasterhit.cpp
@@ -267,3 +267,5 @@ void QRayCasterHit::setEntity(Qt3DCore::QEntity *entity) const
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qraycasterhit.cpp"
diff --git a/src/render/picking/qscreenraycaster.cpp b/src/render/picking/qscreenraycaster.cpp
index a8535187f..cfd4ed400 100644
--- a/src/render/picking/qscreenraycaster.cpp
+++ b/src/render/picking/qscreenraycaster.cpp
@@ -151,3 +151,5 @@ QAbstractRayCaster::Hits QScreenRayCaster::pick(const QPoint &position)
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qscreenraycaster.cpp"
diff --git a/src/render/qrendererplugin.cpp b/src/render/qrendererplugin.cpp
index edd4b1bf0..a267ff8f3 100644
--- a/src/render/qrendererplugin.cpp
+++ b/src/render/qrendererplugin.cpp
@@ -65,3 +65,5 @@ AbstractRenderer *QRendererPlugin::create(const QString &key)
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qrendererplugin_p.cpp"
diff --git a/src/render/raycasting/qabstractcollisionqueryservice.cpp b/src/render/raycasting/qabstractcollisionqueryservice.cpp
index 5148df911..852c11794 100644
--- a/src/render/raycasting/qabstractcollisionqueryservice.cpp
+++ b/src/render/raycasting/qabstractcollisionqueryservice.cpp
@@ -72,3 +72,5 @@ void QAbstractCollisionQueryService::addEntityHit(QCollisionQueryResult &result,
 } // Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qabstractcollisionqueryservice_p.cpp"
diff --git a/src/render/renderstates/qalphacoverage.cpp b/src/render/renderstates/qalphacoverage.cpp
index 785e79057..6b372860f 100644
--- a/src/render/renderstates/qalphacoverage.cpp
+++ b/src/render/renderstates/qalphacoverage.cpp
@@ -161,3 +161,5 @@ QAlphaCoverage::~QAlphaCoverage()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qalphacoverage.cpp"
diff --git a/src/render/renderstates/qalphatest.cpp b/src/render/renderstates/qalphatest.cpp
index ebc455111..111e8addf 100644
--- a/src/render/renderstates/qalphatest.cpp
+++ b/src/render/renderstates/qalphatest.cpp
@@ -162,3 +162,5 @@ void QAlphaTest::setReferenceValue(float referenceValue)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qalphatest.cpp"
diff --git a/src/render/renderstates/qblendequation.cpp b/src/render/renderstates/qblendequation.cpp
index de7cb4a25..af0d7d37f 100644
--- a/src/render/renderstates/qblendequation.cpp
+++ b/src/render/renderstates/qblendequation.cpp
@@ -124,3 +124,5 @@ void QBlendEquation::setBlendFunction(QBlendEquation::BlendFunction blendFunctio
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qblendequation.cpp"
diff --git a/src/render/renderstates/qblendequationarguments.cpp b/src/render/renderstates/qblendequationarguments.cpp
index 0e8b5d9aa..8a4ce8262 100644
--- a/src/render/renderstates/qblendequationarguments.cpp
+++ b/src/render/renderstates/qblendequationarguments.cpp
@@ -206,7 +206,7 @@ void QBlendEquationArguments::setSourceAlpha(QBlendEquationArguments::Blending s
 }
 
 /*!
-    \qmlproperty enumeration BlendEquationArguments::DestinationAlpha
+    \qmlproperty enumeration BlendEquationArguments::destinationAlpha
 
  */
 
@@ -293,3 +293,5 @@ void QBlendEquationArguments::setBufferIndex(int bufferIndex)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qblendequationarguments.cpp"
diff --git a/src/render/renderstates/qclipplane.cpp b/src/render/renderstates/qclipplane.cpp
index 0771e01d5..b1bd7d765 100644
--- a/src/render/renderstates/qclipplane.cpp
+++ b/src/render/renderstates/qclipplane.cpp
@@ -166,3 +166,5 @@ void QClipPlane::setDistance(float distance)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qclipplane.cpp"
diff --git a/src/render/renderstates/qcolormask.cpp b/src/render/renderstates/qcolormask.cpp
index 0e1711671..f1f724b90 100644
--- a/src/render/renderstates/qcolormask.cpp
+++ b/src/render/renderstates/qcolormask.cpp
@@ -186,3 +186,5 @@ void QColorMask::setAlphaMasked(bool alphaMasked)
 
 QT_END_NAMESPACE
 
+#include "moc_qcolormask.cpp"
+
diff --git a/src/render/renderstates/qcullface.cpp b/src/render/renderstates/qcullface.cpp
index b5138e53a..e903af8a3 100644
--- a/src/render/renderstates/qcullface.cpp
+++ b/src/render/renderstates/qcullface.cpp
@@ -192,3 +192,5 @@ void QCullFace::setMode(QCullFace::CullingMode mode)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qcullface.cpp"
diff --git a/src/render/renderstates/qdepthrange.cpp b/src/render/renderstates/qdepthrange.cpp
index e2f1c5473..be4647e8b 100644
--- a/src/render/renderstates/qdepthrange.cpp
+++ b/src/render/renderstates/qdepthrange.cpp
@@ -143,3 +143,5 @@ void QDepthRange::setFarValue(double value)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qdepthrange.cpp"
diff --git a/src/render/renderstates/qdepthtest.cpp b/src/render/renderstates/qdepthtest.cpp
index 16b7ad588..4e1cac358 100644
--- a/src/render/renderstates/qdepthtest.cpp
+++ b/src/render/renderstates/qdepthtest.cpp
@@ -148,3 +148,5 @@ void QDepthTest::setDepthFunction(QDepthTest::DepthFunction depthFunction)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qdepthtest.cpp"
diff --git a/src/render/renderstates/qdithering.cpp b/src/render/renderstates/qdithering.cpp
index a449be508..409e3c9c3 100644
--- a/src/render/renderstates/qdithering.cpp
+++ b/src/render/renderstates/qdithering.cpp
@@ -99,3 +99,5 @@ QDithering::~QDithering()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qdithering.cpp"
diff --git a/src/render/renderstates/qfrontface.cpp b/src/render/renderstates/qfrontface.cpp
index b13f901d9..b913e7b1f 100644
--- a/src/render/renderstates/qfrontface.cpp
+++ b/src/render/renderstates/qfrontface.cpp
@@ -121,3 +121,5 @@ void QFrontFace::setDirection(QFrontFace::WindingDirection direction)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qfrontface.cpp"
diff --git a/src/render/renderstates/qlinewidth.cpp b/src/render/renderstates/qlinewidth.cpp
index abda5ef62..95ad63914 100644
--- a/src/render/renderstates/qlinewidth.cpp
+++ b/src/render/renderstates/qlinewidth.cpp
@@ -111,3 +111,5 @@ void QLineWidth::setSmooth(bool enabled)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qlinewidth.cpp"
diff --git a/src/render/renderstates/qmultisampleantialiasing.cpp b/src/render/renderstates/qmultisampleantialiasing.cpp
index 249dcd4bd..303474fbb 100644
--- a/src/render/renderstates/qmultisampleantialiasing.cpp
+++ b/src/render/renderstates/qmultisampleantialiasing.cpp
@@ -203,3 +203,5 @@ QMultiSampleAntiAliasing::~QMultiSampleAntiAliasing()
 
 QT_END_NAMESPACE
 
+#include "moc_qmultisampleantialiasing.cpp"
+
diff --git a/src/render/renderstates/qnodepthmask.cpp b/src/render/renderstates/qnodepthmask.cpp
index 241751a26..bd1af22f0 100644
--- a/src/render/renderstates/qnodepthmask.cpp
+++ b/src/render/renderstates/qnodepthmask.cpp
@@ -100,3 +100,5 @@ QNoDepthMask::~QNoDepthMask()
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qnodepthmask.cpp"
diff --git a/src/render/renderstates/qpointsize.cpp b/src/render/renderstates/qpointsize.cpp
index 7e085c723..1fee39c24 100644
--- a/src/render/renderstates/qpointsize.cpp
+++ b/src/render/renderstates/qpointsize.cpp
@@ -140,3 +140,5 @@ void QPointSize::setValue(float size)
 
 QT_END_NAMESPACE
 
+#include "moc_qpointsize.cpp"
+
diff --git a/src/render/renderstates/qpolygonoffset.cpp b/src/render/renderstates/qpolygonoffset.cpp
index d310c9c01..4b06b4846 100644
--- a/src/render/renderstates/qpolygonoffset.cpp
+++ b/src/render/renderstates/qpolygonoffset.cpp
@@ -141,3 +141,5 @@ void QPolygonOffset::setDepthSteps(float depthSteps)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qpolygonoffset.cpp"
diff --git a/src/render/renderstates/qrastermode.cpp b/src/render/renderstates/qrastermode.cpp
index 2ac14470c..b34ac7096 100644
--- a/src/render/renderstates/qrastermode.cpp
+++ b/src/render/renderstates/qrastermode.cpp
@@ -182,3 +182,5 @@ void QRasterMode::setFaceMode(QRasterMode::FaceMode faceMode)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qrastermode.cpp"
diff --git a/src/render/renderstates/qrenderstate.cpp b/src/render/renderstates/qrenderstate.cpp
index c23c45319..23e887823 100644
--- a/src/render/renderstates/qrenderstate.cpp
+++ b/src/render/renderstates/qrenderstate.cpp
@@ -107,3 +107,5 @@ QRenderState::QRenderState(QRenderStatePrivate &dd, QNode *parent)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qrenderstate.cpp"
diff --git a/src/render/renderstates/qscissortest.cpp b/src/render/renderstates/qscissortest.cpp
index ee12d0c71..a8364838a 100644
--- a/src/render/renderstates/qscissortest.cpp
+++ b/src/render/renderstates/qscissortest.cpp
@@ -190,3 +190,5 @@ void QScissorTest::setHeight(int height)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qscissortest.cpp"
diff --git a/src/render/renderstates/qseamlesscubemap.cpp b/src/render/renderstates/qseamlesscubemap.cpp
index 8458aded8..b05e4b9ca 100644
--- a/src/render/renderstates/qseamlesscubemap.cpp
+++ b/src/render/renderstates/qseamlesscubemap.cpp
@@ -97,3 +97,5 @@ QSeamlessCubemap::~QSeamlessCubemap()
 
 QT_END_NAMESPACE
 
+#include "moc_qseamlesscubemap.cpp"
+
diff --git a/src/render/renderstates/qstencilmask.cpp b/src/render/renderstates/qstencilmask.cpp
index 9e664ebe2..c1c716920 100644
--- a/src/render/renderstates/qstencilmask.cpp
+++ b/src/render/renderstates/qstencilmask.cpp
@@ -144,3 +144,5 @@ uint QStencilMask::backOutputMask() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qstencilmask.cpp"
diff --git a/src/render/renderstates/qstenciloperation.cpp b/src/render/renderstates/qstenciloperation.cpp
index 720de88a9..5405a88aa 100644
--- a/src/render/renderstates/qstenciloperation.cpp
+++ b/src/render/renderstates/qstenciloperation.cpp
@@ -152,3 +152,5 @@ QStencilOperationArguments *QStencilOperation::back() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qstenciloperation.cpp"
diff --git a/src/render/renderstates/qstenciloperationarguments.cpp b/src/render/renderstates/qstenciloperationarguments.cpp
index d062203f5..d477f2bac 100644
--- a/src/render/renderstates/qstenciloperationarguments.cpp
+++ b/src/render/renderstates/qstenciloperationarguments.cpp
@@ -229,3 +229,5 @@ QStencilOperationArguments::Operation QStencilOperationArguments::allTestsPassOp
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qstenciloperationarguments.cpp"
diff --git a/src/render/renderstates/qstenciltest.cpp b/src/render/renderstates/qstenciltest.cpp
index 200d4461c..f680b5b11 100644
--- a/src/render/renderstates/qstenciltest.cpp
+++ b/src/render/renderstates/qstenciltest.cpp
@@ -153,3 +153,5 @@ QStencilTestArguments *QStencilTest::back() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qstenciltest.cpp"
diff --git a/src/render/renderstates/qstenciltestarguments.cpp b/src/render/renderstates/qstenciltestarguments.cpp
index dc8ff7292..9aeb0c5ac 100644
--- a/src/render/renderstates/qstenciltestarguments.cpp
+++ b/src/render/renderstates/qstenciltestarguments.cpp
@@ -217,3 +217,5 @@ QStencilTestArguments::StencilFaceMode QStencilTestArguments::faceMode() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qstenciltestarguments.cpp"
diff --git a/src/render/shadergraph/qshaderlanguage.cpp b/src/render/shadergraph/qshaderlanguage.cpp
index 1630e3de8..25c19cb18 100644
--- a/src/render/shadergraph/qshaderlanguage.cpp
+++ b/src/render/shadergraph/qshaderlanguage.cpp
@@ -55,3 +55,5 @@ void qt_register_ShaderLanguage_enums()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qshaderlanguage_p.cpp"
diff --git a/src/render/texture/qabstracttexture.cpp b/src/render/texture/qabstracttexture.cpp
index 506627105..98e6a3db4 100644
--- a/src/render/texture/qabstracttexture.cpp
+++ b/src/render/texture/qabstracttexture.cpp
@@ -1125,3 +1125,5 @@ void QAbstractTexture::updateData(const QTextureDataUpdate &update)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qabstracttexture.cpp"
diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp
index 2d41af8e2..97b60566d 100644
--- a/src/render/texture/qabstracttextureimage.cpp
+++ b/src/render/texture/qabstracttextureimage.cpp
@@ -274,3 +274,5 @@ QAbstractTextureImage::QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Q
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qabstracttextureimage.cpp"
diff --git a/src/render/texture/qpaintedtextureimage.cpp b/src/render/texture/qpaintedtextureimage.cpp
index a741205af..147f6c4c4 100644
--- a/src/render/texture/qpaintedtextureimage.cpp
+++ b/src/render/texture/qpaintedtextureimage.cpp
@@ -264,3 +264,5 @@ bool QPaintedTextureImageDataGenerator::operator ==(const QTextureImageDataGener
 
 QT_END_NAMESPACE
 
+#include "moc_qpaintedtextureimage.cpp"
+
diff --git a/src/render/texture/qtexture.cpp b/src/render/texture/qtexture.cpp
index 10e6c327e..b91398168 100644
--- a/src/render/texture/qtexture.cpp
+++ b/src/render/texture/qtexture.cpp
@@ -1514,8 +1514,8 @@ QTextureLoader::QTextureLoader(QNode *parent)
 
     // Regenerate the texture functor when properties we support overriding
     // from QAbstractTexture get changed.
-    Q_D(QTextureLoader);
-    auto regenerate = [=] () {
+    auto regenerate = [this] () {
+        Q_D(QTextureLoader);
         if (!notificationsBlocked())    // check the change doesn't come from the backend
             d->updateGenerator();
     };
@@ -1775,3 +1775,5 @@ void QSharedGLTexture::setTextureId(int id)
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qtexture.cpp"
diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp
index c2d2308af..3f2f892e4 100644
--- a/src/render/texture/qtextureimage.cpp
+++ b/src/render/texture/qtextureimage.cpp
@@ -319,3 +319,5 @@ bool QImageTextureDataFunctor::isMirrored() const
 
 QT_END_NAMESPACE
 
+#include "moc_qtextureimage.cpp"
+
diff --git a/src/render/texture/qtexturewrapmode.cpp b/src/render/texture/qtexturewrapmode.cpp
index cb9272895..18a7f78a1 100644
--- a/src/render/texture/qtexturewrapmode.cpp
+++ b/src/render/texture/qtexturewrapmode.cpp
@@ -182,3 +182,5 @@ QTextureWrapMode::WrapMode QTextureWrapMode::z() const
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
+
+#include "moc_qtexturewrapmode.cpp"
diff --git a/tests/auto/core/common/qbackendnodetester.cpp b/tests/auto/core/common/qbackendnodetester.cpp
index 0f13b481f..fe752adba 100644
--- a/tests/auto/core/common/qbackendnodetester.cpp
+++ b/tests/auto/core/common/qbackendnodetester.cpp
@@ -58,3 +58,5 @@ void QBackendNodeTester::setPeerId(QBackendNode *backend, QNodeId id)
 } // namespace Qt3DCore
 
 QT_END_NAMESPACE
+
+#include "moc_qbackendnodetester.cpp"
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index 1edaf42ce..b5458e2e7 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -40,6 +40,7 @@
 #include <Qt3DCore/private/qnode_p.h>
 #include <Qt3DCore/private/qcomponent_p.h>
 #include <Qt3DCore/private/vector_helper_p.h>
+#include <QSet>
 #include <QSignalSpy>
 #include <testarbiter.h>
 #include <vector>
diff --git a/tests/auto/input/abstractaxisinput/CMakeLists.txt b/tests/auto/input/abstractaxisinput/CMakeLists.txt
index 10dc60834..7d8bf5518 100644
--- a/tests/auto/input/abstractaxisinput/CMakeLists.txt
+++ b/tests/auto/input/abstractaxisinput/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_abstractaxisinput
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_abstractaxisinput.cpp
     INCLUDE_DIRECTORIES
@@ -30,5 +31,5 @@ qt_internal_add_test(tst_abstractaxisinput
 qt_internal_extend_target(tst_abstractaxisinput CONDITION QT_FEATURE_private_tests
     SOURCES
         ../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h
-        ../../core/common/testarbiter.h
+        ../../core/common/testarbiter.h ../commons/testdevice.cpp
 )
diff --git a/tests/auto/input/actioninput/CMakeLists.txt b/tests/auto/input/actioninput/CMakeLists.txt
index f9564e2ac..aef9c7df4 100644
--- a/tests/auto/input/actioninput/CMakeLists.txt
+++ b/tests/auto/input/actioninput/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_actioninput
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_actioninput.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/analogaxisinput/CMakeLists.txt b/tests/auto/input/analogaxisinput/CMakeLists.txt
index 72cbbf68c..70645da56 100644
--- a/tests/auto/input/analogaxisinput/CMakeLists.txt
+++ b/tests/auto/input/analogaxisinput/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_analogaxisinput
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_analogaxisinput.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/buttonaxisinput/CMakeLists.txt b/tests/auto/input/buttonaxisinput/CMakeLists.txt
index 3329ff12c..6529b75b6 100644
--- a/tests/auto/input/buttonaxisinput/CMakeLists.txt
+++ b/tests/auto/input/buttonaxisinput/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_buttonaxisinput
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_buttonaxisinput.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/commons/testdevice.cpp b/tests/auto/input/commons/testdevice.cpp
new file mode 100644
index 000000000..898766fe7
--- /dev/null
+++ b/tests/auto/input/commons/testdevice.cpp
@@ -0,0 +1,30 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "moc_testdevice.cpp"
+#include "moc_testdeviceproxy.cpp"
diff --git a/tests/auto/input/inputchord/CMakeLists.txt b/tests/auto/input/inputchord/CMakeLists.txt
index 49257f421..aeca88132 100644
--- a/tests/auto/input/inputchord/CMakeLists.txt
+++ b/tests/auto/input/inputchord/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_inputchord
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_inputchord.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/inputsequence/CMakeLists.txt b/tests/auto/input/inputsequence/CMakeLists.txt
index b0faec313..6e58f758b 100644
--- a/tests/auto/input/inputsequence/CMakeLists.txt
+++ b/tests/auto/input/inputsequence/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_inputsequence
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_inputsequence.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/keyboardhandler/CMakeLists.txt b/tests/auto/input/keyboardhandler/CMakeLists.txt
index 8726bd533..146177c86 100644
--- a/tests/auto/input/keyboardhandler/CMakeLists.txt
+++ b/tests/auto/input/keyboardhandler/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_keyboardhandler
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_keyboardhandler.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/loadproxydevicejob/CMakeLists.txt b/tests/auto/input/loadproxydevicejob/CMakeLists.txt
index edb18d443..54c71fa26 100644
--- a/tests/auto/input/loadproxydevicejob/CMakeLists.txt
+++ b/tests/auto/input/loadproxydevicejob/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_loadproxydevicejob
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_loadproxydevicejob.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/physicaldeviceproxy/CMakeLists.txt b/tests/auto/input/physicaldeviceproxy/CMakeLists.txt
index 263e6ef4b..0598f3045 100644
--- a/tests/auto/input/physicaldeviceproxy/CMakeLists.txt
+++ b/tests/auto/input/physicaldeviceproxy/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_physicaldeviceproxy
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_physicaldeviceproxy.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qabstractaxisinput/CMakeLists.txt b/tests/auto/input/qabstractaxisinput/CMakeLists.txt
index 28d7f53b2..30e354690 100644
--- a/tests/auto/input/qabstractaxisinput/CMakeLists.txt
+++ b/tests/auto/input/qabstractaxisinput/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_qabstractaxisinput
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_qabstractaxisinput.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qabstractphysicaldevicebackendnode/CMakeLists.txt b/tests/auto/input/qabstractphysicaldevicebackendnode/CMakeLists.txt
index 2d42dd1f7..205c9c415 100644
--- a/tests/auto/input/qabstractphysicaldevicebackendnode/CMakeLists.txt
+++ b/tests/auto/input/qabstractphysicaldevicebackendnode/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_qabstractphysicaldevicebackendnode
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_qabstractphysicaldevicebackendnode.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qabstractphysicaldeviceproxy/CMakeLists.txt b/tests/auto/input/qabstractphysicaldeviceproxy/CMakeLists.txt
index e1d6aac23..33ebd9fb8 100644
--- a/tests/auto/input/qabstractphysicaldeviceproxy/CMakeLists.txt
+++ b/tests/auto/input/qabstractphysicaldeviceproxy/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_qabstractphysicaldeviceproxy
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_qabstractphysicaldeviceproxy.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qaction/CMakeLists.txt b/tests/auto/input/qaction/CMakeLists.txt
index 724ef0b7a..1a16130c8 100644
--- a/tests/auto/input/qaction/CMakeLists.txt
+++ b/tests/auto/input/qaction/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_internal_add_test(tst_qt3d_qaction
 # special case end
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_qaction.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qactioninput/CMakeLists.txt b/tests/auto/input/qactioninput/CMakeLists.txt
index 186b30b49..8fb91057d 100644
--- a/tests/auto/input/qactioninput/CMakeLists.txt
+++ b/tests/auto/input/qactioninput/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_qactioninput
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_qactioninput.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qanalogaxisinput/CMakeLists.txt b/tests/auto/input/qanalogaxisinput/CMakeLists.txt
index 147ff97c3..a4c66c558 100644
--- a/tests/auto/input/qanalogaxisinput/CMakeLists.txt
+++ b/tests/auto/input/qanalogaxisinput/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_qanalogaxisinput
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_qanalogaxisinput.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qaxisaccumulator/CMakeLists.txt b/tests/auto/input/qaxisaccumulator/CMakeLists.txt
index 86337c38e..a26215f93 100644
--- a/tests/auto/input/qaxisaccumulator/CMakeLists.txt
+++ b/tests/auto/input/qaxisaccumulator/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_qaxisaccumulator
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_qaxisaccumulator.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qbuttonaxisinput/CMakeLists.txt b/tests/auto/input/qbuttonaxisinput/CMakeLists.txt
index 36698b66a..0a0b1729a 100644
--- a/tests/auto/input/qbuttonaxisinput/CMakeLists.txt
+++ b/tests/auto/input/qbuttonaxisinput/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_qbuttonaxisinput
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_qbuttonaxisinput.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qkeyboardhandler/CMakeLists.txt b/tests/auto/input/qkeyboardhandler/CMakeLists.txt
index 452292249..6285d9af0 100644
--- a/tests/auto/input/qkeyboardhandler/CMakeLists.txt
+++ b/tests/auto/input/qkeyboardhandler/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_qkeyboardhandler
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_qkeyboardhandler.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qmousedevice/CMakeLists.txt b/tests/auto/input/qmousedevice/CMakeLists.txt
index 62e3247ec..a8f4ed6b6 100644
--- a/tests/auto/input/qmousedevice/CMakeLists.txt
+++ b/tests/auto/input/qmousedevice/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_qmousedevice
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_qmousedevice.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qmouseevent/CMakeLists.txt b/tests/auto/input/qmouseevent/CMakeLists.txt
index 8a2e0bb8b..39698ade4 100644
--- a/tests/auto/input/qmouseevent/CMakeLists.txt
+++ b/tests/auto/input/qmouseevent/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_internal_add_test(tst_qt3d_qmouseevent
 #special case end
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_qmouseevent.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/utils/CMakeLists.txt b/tests/auto/input/utils/CMakeLists.txt
index 0ff18ec4d..2576b2b88 100644
--- a/tests/auto/input/utils/CMakeLists.txt
+++ b/tests/auto/input/utils/CMakeLists.txt
@@ -7,6 +7,7 @@
 qt_internal_add_test(tst_utils
     SOURCES
         ../commons/testdevice.h
+        ../commons/testdevice.cpp
         ../commons/testdeviceproxy.h
         tst_utils.cpp
     INCLUDE_DIRECTORIES
diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp b/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp
index 0071a2aad..f06ce70d3 100644
--- a/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp
+++ b/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp
@@ -253,3 +253,4 @@ void tst_quick3dnodeinstantiator::createAndRemove()
 QTEST_MAIN(tst_quick3dnodeinstantiator)
 
 #include "tst_quick3dnodeinstantiator.moc"
+#include "moc_stringmodel.cpp"
diff --git a/tests/auto/render/qmlscenereader/qmlscenereader.cpp b/tests/auto/render/qmlscenereader/qmlscenereader.cpp
index 182782edb..417a75880 100644
--- a/tests/auto/render/qmlscenereader/qmlscenereader.cpp
+++ b/tests/auto/render/qmlscenereader/qmlscenereader.cpp
@@ -82,3 +82,5 @@ void QmlSceneReader::loadComplete()
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qmlscenereader.cpp"
diff --git a/tests/auto/render/qmlscenereader/qmlscenereader.h b/tests/auto/render/qmlscenereader/qmlscenereader.h
index 9d4643d93..75a74d03a 100644
--- a/tests/auto/render/qmlscenereader/qmlscenereader.h
+++ b/tests/auto/render/qmlscenereader/qmlscenereader.h
@@ -37,6 +37,9 @@
 **
 ****************************************************************************/
 
+#ifndef QMLSCENEREADER_H
+#define QMLSCENEREADER_H
+
 #include <QObject>
 
 QT_BEGIN_NAMESPACE
@@ -61,3 +64,5 @@ private:
 };
 
 QT_END_NAMESPACE
+
+#endif
diff --git a/tests/auto/render/scene2d/tst_scene2d.cpp b/tests/auto/render/scene2d/tst_scene2d.cpp
index 53075c692..a71d2f54a 100644
--- a/tests/auto/render/scene2d/tst_scene2d.cpp
+++ b/tests/auto/render/scene2d/tst_scene2d.cpp
@@ -123,6 +123,8 @@ private Q_SLOTS:
 
     void checkInitializeFromPeer()
     {
+        QSKIP("Skipped as crashing since 6.4.0");
+
         // GIVEN
         Qt3DRender::Quick::QScene2D frontend;
         TestRenderer renderer;
@@ -158,6 +160,7 @@ private Q_SLOTS:
 
     void checkSceneChangeEvents()
     {
+        QSKIP("Skipped as crashing since 6.4.0");
         // GIVEN
         Qt3DRender::Quick::QScene2D frontend;
         QScopedPointer<Scene2D> backendScene2d(new Scene2D());
@@ -207,6 +210,7 @@ private Q_SLOTS:
 
     void testCoordinateCalculation()
     {
+        QSKIP("Skipped as crashing since 6.4.0");
         // GIVEN
         qputenv("QT3D_SCENE2D_DISABLE_RENDERING", "1");
 
diff --git a/tests/auto/shared/util.cpp b/tests/auto/shared/util.cpp
index 55041eeb4..d4a19164a 100644
--- a/tests/auto/shared/util.cpp
+++ b/tests/auto/shared/util.cpp
@@ -123,3 +123,5 @@ QQmlTestMessageHandler::~QQmlTestMessageHandler()
     qInstallMessageHandler(m_oldHandler);
     QQmlTestMessageHandler::m_instance = 0;
 }
+
+#include "moc_util.cpp"