From 701dee095808ec2aad919dd1cbc5bbde7fe11ed0 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Fri, 27 May 2022 16:26:51 +0100 Subject: Restore PLY support to Assimp Task-number: QTBUG-102445 Change-Id: Iaf23683e5abcf46d95f648610bc26d4acecb3c14 Reviewed-by: Qt CI Bot Reviewed-by: Paul Lemire --- src/3rdparty/assimp/assimp.pri | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/assimp/assimp.pri b/src/3rdparty/assimp/assimp.pri index 2ad74b9d6..9d5fd9225 100644 --- a/src/3rdparty/assimp/assimp.pri +++ b/src/3rdparty/assimp/assimp.pri @@ -18,7 +18,6 @@ DEFINES += \ ASSIMP_BUILD_NO_MD3_IMPORTER \ ASSIMP_BUILD_NO_MDL_IMPORTER \ ASSIMP_BUILD_NO_MD2_IMPORTER \ - ASSIMP_BUILD_NO_PLY_IMPORTER \ ASSIMP_BUILD_NO_ASE_IMPORTER \ ASSIMP_BUILD_NO_HMP_IMPORTER \ ASSIMP_BUILD_NO_SMD_IMPORTER \ @@ -258,6 +257,8 @@ HEADERS += \ $$PWD/src/code/FBX/FBXProperties.h \ $$PWD/src/code/FBX/FBXMeshGeometry.h \ $$PWD/src/code/FBX/FBXCommon.h \ + $$PWD/src/code/Ply/PlyLoader.h \ + $$PWD/src/code/Ply/PlyParser.h \ $$PWD/src/code/PostProcessing/CalcTangentsProcess.h \ $$PWD/src/code/PostProcessing/ComputeUVMappingProcess.h \ $$PWD/src/code/PostProcessing/ConvertToLHProcess.h \ @@ -356,6 +357,8 @@ SOURCES += \ $$PWD/src/code/FBX/FBXDeformer.cpp \ $$PWD/src/code/FBX/FBXBinaryTokenizer.cpp \ $$PWD/src/code/FBX/FBXDocumentUtil.cpp \ + $$PWD/src/code/Ply/PlyLoader.cpp \ + $$PWD/src/code/Ply/PlyParser.cpp \ $$PWD/src/code/PostProcessing/CalcTangentsProcess.cpp \ $$PWD/src/code/PostProcessing/ComputeUVMappingProcess.cpp \ $$PWD/src/code/PostProcessing/ConvertToLHProcess.cpp \ -- cgit v1.2.3 From dbe025fb6834be267adf75dfb871df9ae0f8970d Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Mon, 13 Jun 2022 10:40:40 +0200 Subject: CalcBoundingVolumeJob: don't rely on QChangeArbiter for extent changes Relying on sync messages is deprecated, CalcBoundingVolumeJob appears to have slipped through when we updated all the other classes. CalcBoundingVolumeJob has therefore been updated to use the postFrame and directly update the frontend Geometry nodes. Note: Qt 3D on Qt6 is correct. Change-Id: I2257bc157474efac8190d763ea7dc331a1d69a86 Reviewed-by: Mike Krus --- src/render/geometry/geometry.cpp | 21 --------------- src/render/geometry/geometry_p.h | 3 --- src/render/geometry/qgeometry.cpp | 39 ++++++++++++++------------- src/render/geometry/qgeometry.h | 1 + src/render/geometry/qgeometry_p.h | 1 + src/render/jobs/calcboundingvolumejob.cpp | 33 ++++++++++++++++++++--- src/render/jobs/calcboundingvolumejob_p.h | 2 ++ tests/auto/render/geometry/tst_geometry.cpp | 10 +++---- tests/auto/render/qgeometry/tst_qgeometry.cpp | 25 +++++++---------- 9 files changed, 66 insertions(+), 69 deletions(-) diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp index dd099fc44..5e653581a 100644 --- a/src/render/geometry/geometry.cpp +++ b/src/render/geometry/geometry.cpp @@ -55,8 +55,6 @@ namespace Render { Geometry::Geometry() : BackendNode(ReadWrite) , m_geometryDirty(false) - , m_shouldNotifyMinExtentChanged(false) - , m_shouldNotifyMaxExtentChanged(false) { } @@ -72,8 +70,6 @@ void Geometry::cleanup() m_boundingPositionAttribute = Qt3DCore::QNodeId(); m_min = QVector3D(); m_max = QVector3D(); - m_shouldNotifyMinExtentChanged = false; - m_shouldNotifyMaxExtentChanged = false; } void Geometry::syncFromFrontEnd(const QNode *frontEnd, bool firstTime) @@ -113,27 +109,10 @@ void Geometry::updateExtent(const QVector3D &min, const QVector3D &max) // Send notification to frontend if (m_min != min) { m_min = min; - m_shouldNotifyMinExtentChanged = true; } if (m_max != max) { m_max = max; - m_shouldNotifyMaxExtentChanged = true; - } -} - -// Called from calcboundingvolumejob after all bounding volumes have been -// updated (in an aspect thread) -void Geometry::notifyExtentChanged() -{ - if (m_shouldNotifyMinExtentChanged || m_shouldNotifyMaxExtentChanged) { - auto change = Qt3DCore::QPropertyUpdatedChangePtr::create(peerId()); - change->setDeliveryFlags(Qt3DCore::QSceneChange::Nodes); - change->setPropertyName("extent"); - change->setValue(QVariant::fromValue(QPair(m_min, m_max))); - notifyObservers(change); - m_shouldNotifyMinExtentChanged = false; - m_shouldNotifyMaxExtentChanged = false; } } diff --git a/src/render/geometry/geometry_p.h b/src/render/geometry/geometry_p.h index f07db902e..d5353e92b 100644 --- a/src/render/geometry/geometry_p.h +++ b/src/render/geometry/geometry_p.h @@ -79,7 +79,6 @@ public: inline QVector3D max() const { return m_max; } void updateExtent(const QVector3D &min, const QVector3D &max); - void notifyExtentChanged(); private: QVector m_attributes; @@ -87,8 +86,6 @@ private: Qt3DCore::QNodeId m_boundingPositionAttribute; QVector3D m_min; QVector3D m_max; - bool m_shouldNotifyMinExtentChanged; - bool m_shouldNotifyMaxExtentChanged; }; } // namespace Render diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp index 383e71b8b..5189cb753 100644 --- a/src/render/geometry/qgeometry.cpp +++ b/src/render/geometry/qgeometry.cpp @@ -64,6 +64,24 @@ QGeometryPrivate::~QGeometryPrivate() { } +void QGeometryPrivate::setExtent(const QVector3D &minExtent, const QVector3D &maxExtent) +{ + Q_Q(QGeometry); + if (m_minExtent != minExtent) { + m_minExtent = minExtent; + const auto wasBlocked = q->blockNotifications(true); + emit q->minExtentChanged(minExtent); + q->blockNotifications(wasBlocked); + } + + if (m_maxExtent != maxExtent) { + m_maxExtent = maxExtent; + const auto wasBlocked = q->blockNotifications(true); + emit q->maxExtentChanged(maxExtent); + q->blockNotifications(wasBlocked); + } +} + /*! \qmltype Geometry \instantiates Qt3DRender::QGeometry @@ -151,26 +169,9 @@ QGeometry::QGeometry(QGeometryPrivate &dd, QNode *parent) { } -void QGeometry::sceneChangeEvent(const QSceneChangePtr &change) +// TODO Unused remove in Qt6 +void QGeometry::sceneChangeEvent(const QSceneChangePtr &) { - Q_D(QGeometry); - QPropertyUpdatedChangePtr e = qSharedPointerCast(change); - if (e->type() == PropertyUpdated) { - const bool blocked = blockNotifications(true); - if (e->propertyName() == QByteArrayLiteral("extent")) { - const QPair extent = e->value().value>(); - - if (extent.first != d->m_minExtent) { - d->m_minExtent = extent.first; - emit minExtentChanged(extent.first); - } - if (extent.second != d->m_maxExtent) { - d->m_maxExtent = extent.second; - emit maxExtentChanged(d->m_maxExtent); - } - } - blockNotifications(blocked); - } } /*! diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h index b49de39fc..31d5759b7 100644 --- a/src/render/geometry/qgeometry.h +++ b/src/render/geometry/qgeometry.h @@ -77,6 +77,7 @@ Q_SIGNALS: Q_REVISION(13) void maxExtentChanged(const QVector3D &maxExtent); protected: explicit QGeometry(QGeometryPrivate &dd, Qt3DCore::QNode *parent = nullptr); + // TODO Unused remove in Qt6 void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override; private: diff --git a/src/render/geometry/qgeometry_p.h b/src/render/geometry/qgeometry_p.h index f5b6ad7d8..a6af8c205 100644 --- a/src/render/geometry/qgeometry_p.h +++ b/src/render/geometry/qgeometry_p.h @@ -66,6 +66,7 @@ public: QGeometryPrivate(); ~QGeometryPrivate(); + void setExtent(const QVector3D &minExtent, const QVector3D &maxExtent); QVector m_attributes; QAttribute *m_boundingVolumePositionAttribute; diff --git a/src/render/jobs/calcboundingvolumejob.cpp b/src/render/jobs/calcboundingvolumejob.cpp index 4fed1e9f0..ab14cce87 100644 --- a/src/render/jobs/calcboundingvolumejob.cpp +++ b/src/render/jobs/calcboundingvolumejob.cpp @@ -53,6 +53,7 @@ #include #include #include +#include #include #if QT_CONFIG(concurrent) @@ -399,8 +400,33 @@ public: } // anonymous +class CalculateBoundingVolumeJobPrivate : public Qt3DCore::QAspectJobPrivate +{ +public: + CalculateBoundingVolumeJobPrivate(CalculateBoundingVolumeJob *q) : q_ptr(q) {} + ~CalculateBoundingVolumeJobPrivate() override = default; + + void postFrame(Qt3DCore::QAspectManager *aspectManager) override + { + for (Geometry *backend : m_updatedGeometries) { + Qt3DRender::QGeometry *node = qobject_cast(aspectManager->lookupNode(backend->peerId())); + if (!node) + continue; + Qt3DRender::QGeometryPrivate *dNode = static_cast(Qt3DCore::QNodePrivate::get(node)); + dNode->setExtent(backend->min(), backend->max()); + } + + m_updatedGeometries.clear(); + } + + QVector m_updatedGeometries; + CalculateBoundingVolumeJob *q_ptr; + Q_DECLARE_PUBLIC(CalculateBoundingVolumeJob) +}; + CalculateBoundingVolumeJob::CalculateBoundingVolumeJob() - : m_manager(nullptr) + : Qt3DCore::QAspectJob(*new CalculateBoundingVolumeJobPrivate(this)) + , m_manager(nullptr) , m_node(nullptr) { SET_JOB_RUN_STAT_TYPE(this, JobTypes::CalcBoundingVolume, 0) @@ -429,9 +455,8 @@ void CalculateBoundingVolumeJob::run() updatedGeometries += calculateLocalBoundingVolume(m_manager, data); } - // Send extent updates to frontend - for (Geometry *geometry : updatedGeometries) - geometry->notifyExtentChanged(); + Q_D(CalculateBoundingVolumeJob); + d->m_updatedGeometries = std::move(updatedGeometries); } void CalculateBoundingVolumeJob::setRoot(Entity *node) diff --git a/src/render/jobs/calcboundingvolumejob_p.h b/src/render/jobs/calcboundingvolumejob_p.h index 604e790f6..6227c3c21 100644 --- a/src/render/jobs/calcboundingvolumejob_p.h +++ b/src/render/jobs/calcboundingvolumejob_p.h @@ -64,6 +64,7 @@ namespace Render { class NodeManagers; class Entity; +class CalculateBoundingVolumeJobPrivate; class Q_3DRENDERSHARED_PRIVATE_EXPORT CalculateBoundingVolumeJob : public Qt3DCore::QAspectJob { @@ -75,6 +76,7 @@ public: void run() override; private: + Q_DECLARE_PRIVATE(CalculateBoundingVolumeJob); NodeManagers *m_manager; Entity *m_node; }; diff --git a/tests/auto/render/geometry/tst_geometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp index a13f6fa40..4e7a94c42 100644 --- a/tests/auto/render/geometry/tst_geometry.cpp +++ b/tests/auto/render/geometry/tst_geometry.cpp @@ -204,16 +204,12 @@ private Q_SLOTS: // WHEN renderGeometry.updateExtent(QVector3D(-1.0f, -1.0f, -1.0f), QVector3D(1.0f, 1.0f, 1.0f)); - renderGeometry.notifyExtentChanged(); // THEN - QCOMPARE(arbiter.events.count(), 1); + QCOMPARE(arbiter.dirtyNodes.count(), 0); - Qt3DCore::QPropertyUpdatedChangePtr change = arbiter.events.first().staticCast(); - QCOMPARE(change->propertyName(), "extent"); - const QPair v = change->value().value>(); - QCOMPARE(v.first, QVector3D(-1.0f, -1.0f, -1.0f)); - QCOMPARE(v.second, QVector3D(1.0f, 1.0f, 1.0f)); + QCOMPARE(renderGeometry.min(), QVector3D(-1.0f, -1.0f, -1.0f)); + QCOMPARE(renderGeometry.max(), QVector3D(1.0f, 1.0f, 1.0f)); arbiter.events.clear(); } diff --git a/tests/auto/render/qgeometry/tst_qgeometry.cpp b/tests/auto/render/qgeometry/tst_qgeometry.cpp index e790ba9cc..b2c66ae72 100644 --- a/tests/auto/render/qgeometry/tst_qgeometry.cpp +++ b/tests/auto/render/qgeometry/tst_qgeometry.cpp @@ -208,31 +208,26 @@ private Q_SLOTS: QCOMPARE(geometry->maxExtent(), QVector3D()); // WHEN - Qt3DCore::QPropertyUpdatedChangePtr valueChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId())); - valueChange->setPropertyName("extent"); - valueChange->setValue(QVariant::fromValue(QPair(QVector3D(10.0f, 10.f, 10.0f), - QVector3D()))); - geometry->sceneChangeEvent(valueChange); + auto dNode = static_cast(Qt3DCore::QNodePrivate::get(geometry.data())); + const QVector3D minExt(-1.0f, -1.0f, -1.0f); + const QVector3D maxExt(1.0f, 1.0f, 1.0f); + dNode->setExtent(minExt, maxExt); // THEN QCOMPARE(spyMinExtent.count(), 1); - QCOMPARE(spyMaxExtent.count(), 0); - QCOMPARE(geometry->minExtent(), QVector3D(10.0f, 10.0f, 10.0f)); + QCOMPARE(spyMaxExtent.count(), 1); + QCOMPARE(geometry->minExtent(), minExt); + QCOMPARE(geometry->maxExtent(), maxExt); + spyMaxExtent.clear(); spyMinExtent.clear(); // WHEN - valueChange->setPropertyName("extent"); - valueChange->setValue(QVariant::fromValue(QPair(QVector3D(10.0f, 10.f, 10.0f), - QVector3D(11.0f, 11.f, 11.0f)))); - geometry->sceneChangeEvent(valueChange); + dNode->setExtent(minExt, maxExt); // THEN QCOMPARE(spyMinExtent.count(), 0); - QCOMPARE(spyMaxExtent.count(), 1); - QCOMPARE(geometry->maxExtent(), QVector3D(11.0f, 11.0f, 11.0f)); - - spyMaxExtent.clear(); + QCOMPARE(spyMaxExtent.count(), 0); } }; -- cgit v1.2.3 From 823ccd357fddea0234311d65cb4dfede739f3621 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Wed, 15 Jun 2022 20:08:36 +0300 Subject: Bump version --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index f76bbfaea..9e85f1311 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 = 5.15.10 +MODULE_VERSION = 5.15.11 -- cgit v1.2.3 From 1706e2fd65504c4ecc8ea731687ce81fa7c47e20 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Thu, 31 Mar 2022 07:18:19 +0200 Subject: QViewport documentation: fix wrong property type for gamma property Change-Id: I9af5214af3ad019e3adf55c7d4d9dfe43a5226ff Task-number: QTBUG-101876 Reviewed-by: Mike Krus (cherry picked from commit 36c3e539030e30c8e9562873c93fda7313c5c818) Reviewed-by: Qt Cherry-pick Bot --- src/render/framegraph/qviewport.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/render/framegraph/qviewport.cpp b/src/render/framegraph/qviewport.cpp index 889c94fac..cf1b89aab 100644 --- a/src/render/framegraph/qviewport.cpp +++ b/src/render/framegraph/qviewport.cpp @@ -88,7 +88,7 @@ QViewportPrivate::QViewportPrivate() */ /*! - \qmlproperty rect Viewport::gamma + \qmlproperty real Viewport::gamma Specifies the gamma factor for the viewport. The default is 2.2 which should give proper result on most screens. */ -- cgit v1.2.3 From 4c95e0c3f096718046b5ddd3e32fe349b4e97fd9 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:31 +0100 Subject: Qtqtquickscene2dplugin: includemocs Task-number: QTBUG-103286 Change-Id: If6e000cf45a430aff58cae48155562d117b8e027 Reviewed-by: Sean Harmer (cherry picked from commit 0300d6336fec0c2fabeb05423a4d8fd83f6777ef) Reviewed-by: Qt Cherry-pick Bot --- src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp b/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp index 13d39287d..fd6e93057 100644 --- a/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp +++ b/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp @@ -59,3 +59,5 @@ void QtQuickScene2DPlugin::registerTypes(const char *uri) } QT_END_NAMESPACE + +#include "moc_qtquickscene2dplugin.cpp" -- cgit v1.2.3 From 806fdf5c9bb5c605b0d029a3404f455fc6c4cce6 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:33 +0100 Subject: Qt3DQuickRender: includemocs Task-number: QTBUG-103286 Change-Id: Ie491bf6d3f492854e4a979650185c73eaaadf04c Reviewed-by: Sean Harmer (cherry picked from commit 8c2ba3e61236334083456516f3fb002ad60cfa7e) Reviewed-by: Qt Cherry-pick Bot --- src/quick3d/quick3drender/items/quick3deffect.cpp | 2 ++ src/quick3d/quick3drender/items/quick3dlayerfilter.cpp | 2 ++ src/quick3d/quick3drender/items/quick3dmaterial.cpp | 2 ++ src/quick3d/quick3drender/items/quick3dmemorybarrier.cpp | 2 ++ src/quick3d/quick3drender/items/quick3dparameter.cpp | 2 ++ src/quick3d/quick3drender/items/quick3draycaster.cpp | 2 ++ src/quick3d/quick3drender/items/quick3drenderpass.cpp | 2 ++ src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp | 2 ++ src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp | 2 ++ src/quick3d/quick3drender/items/quick3dscene.cpp | 2 ++ src/quick3d/quick3drender/items/quick3dscreenraycaster.cpp | 2 ++ src/quick3d/quick3drender/items/quick3dshaderdata.cpp | 2 ++ src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp | 2 ++ src/quick3d/quick3drender/items/quick3dstateset.cpp | 2 ++ src/quick3d/quick3drender/items/quick3dtechnique.cpp | 2 ++ src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp | 2 ++ src/quick3d/quick3drender/items/quick3dtexture.cpp | 2 ++ src/quick3d/quick3drender/items/quick3dviewport.cpp | 2 ++ 18 files changed, 36 insertions(+) diff --git a/src/quick3d/quick3drender/items/quick3deffect.cpp b/src/quick3d/quick3drender/items/quick3deffect.cpp index 259abb790..53fc609c2 100644 --- a/src/quick3d/quick3drender/items/quick3deffect.cpp +++ b/src/quick3d/quick3drender/items/quick3deffect.cpp @@ -137,3 +137,5 @@ void Quick3DEffect::clearParameterList(QQmlListProperty *list) } // 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 51db98623..bc0dc2a8b 100644 --- a/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp +++ b/src/quick3d/quick3drender/items/quick3dlayerfilter.cpp @@ -106,3 +106,5 @@ void Quick3DLayerFilter::clearLayers(QQmlListProperty *list) } // 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 d51a24352..4bd76b4a1 100644 --- a/src/quick3d/quick3drender/items/quick3dmaterial.cpp +++ b/src/quick3d/quick3drender/items/quick3dmaterial.cpp @@ -105,3 +105,5 @@ void Quick3DMaterial::clearParameters(QQmlListProperty *list) } // 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 f564e94d1..4637525c3 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 a07e1a06d..63fbccb6f 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 a523f4cca..759210be9 100644 --- a/src/quick3d/quick3drender/items/quick3draycaster.cpp +++ b/src/quick3d/quick3drender/items/quick3draycaster.cpp @@ -173,3 +173,5 @@ QQmlListProperty 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 2033b1dad..0ba076b4f 100644 --- a/src/quick3d/quick3drender/items/quick3drenderpass.cpp +++ b/src/quick3d/quick3drender/items/quick3drenderpass.cpp @@ -162,3 +162,5 @@ void Quick3DRenderPass::clearParameterList(QQmlListProperty *list) } // 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 409e6ca89..5f4ff645d 100644 --- a/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp +++ b/src/quick3d/quick3drender/items/quick3drenderpassfilter.cpp @@ -135,3 +135,5 @@ void Quick3DRenderPassFilter::clearParameterList(QQmlListProperty *l } // 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 7958d4171..db4c121a8 100644 --- a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp +++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp @@ -97,3 +97,5 @@ void Quick3DRenderTargetOutput::clearRenderAttachments(QQmlListProperty 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 8c3795ff6..1418d1515 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 a447000da..509d41a99 100644 --- a/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp +++ b/src/quick3d/quick3drender/items/quick3dshaderdataarray.cpp @@ -114,3 +114,5 @@ void Quick3DShaderDataArray::clearValues(QQmlListProperty *list) } // 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 a9c1434ea..69e92772d 100644 --- a/src/quick3d/quick3drender/items/quick3dstateset.cpp +++ b/src/quick3d/quick3drender/items/quick3dstateset.cpp @@ -96,3 +96,5 @@ void Quick3DStateSet::clearRenderStates(QQmlListProperty *list) 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 8ea31e880..b73c0d771 100644 --- a/src/quick3d/quick3drender/items/quick3dtechnique.cpp +++ b/src/quick3d/quick3drender/items/quick3dtechnique.cpp @@ -178,3 +178,5 @@ void Quick3DTechnique::clearFilterKeyList(QQmlListProperty *list) } // 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 94c3e442b..cec34c3db 100644 --- a/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp +++ b/src/quick3d/quick3drender/items/quick3dtechniquefilter.cpp @@ -134,3 +134,5 @@ void Quick3DTechniqueFilter::clearParameterList(QQmlListProperty *li } // 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 f251c76e7..590bd70e4 100644 --- a/src/quick3d/quick3drender/items/quick3dtexture.cpp +++ b/src/quick3d/quick3drender/items/quick3dtexture.cpp @@ -98,3 +98,5 @@ void Quick3DTextureExtension::clearTextureImageList(QQmlListProperty Date: Tue, 21 Jun 2022 10:59:32 +0100 Subject: Qt3DQuickScene2D: includemocs Task-number: QTBUG-103286 Change-Id: I5cc37be9d217d511d56238ade3cf59acec8f4081 Reviewed-by: Sean Harmer (cherry picked from commit 0f92fc937bdffb6f5d693a07f1547d9dfc5b0a9e) Reviewed-by: Qt Cherry-pick Bot --- src/quick3d/quick3dscene2d/items/qscene2d.cpp | 2 ++ src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp | 2 ++ src/quick3d/quick3dscene2d/items/scene2d.cpp | 2 ++ src/quick3d/quick3dscene2d/items/scene2dmanager.cpp | 2 ++ 4 files changed, 8 insertions(+) diff --git a/src/quick3d/quick3dscene2d/items/qscene2d.cpp b/src/quick3d/quick3dscene2d/items/qscene2d.cpp index 29fec7570..3d99dff60 100644 --- a/src/quick3d/quick3dscene2d/items/qscene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/qscene2d.cpp @@ -369,3 +369,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 72a869cc7..f2d29906f 100644 --- a/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/qt3dquick3dscene2d.cpp @@ -98,3 +98,5 @@ void QQuick3DScene2D::clearEntities(QQmlListProperty *list) } // 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 03eaabbe9..3d5ef6bdc 100644 --- a/src/quick3d/quick3dscene2d/items/scene2d.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2d.cpp @@ -524,3 +524,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 ff9450063..5cde5213f 100644 --- a/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2dmanager.cpp @@ -254,3 +254,5 @@ void Scene2DManager::cleanup() } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_scene2dmanager_p.cpp" -- cgit v1.2.3 From cebaa57672182990398a3eb2b180353254afb78b Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:32 +0100 Subject: Qtquick3dextrasplugin: includemocs Task-number: QTBUG-103286 Change-Id: I45765ad198481b868cde062545116a4bf8d2f3da Reviewed-by: Sean Harmer (cherry picked from commit 34aaca6c1f9a12321c96e0c42b91edc935739f90) Reviewed-by: Qt Cherry-pick Bot --- src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index 165c9584f..4c938a84c 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -153,3 +153,5 @@ QT_WARNING_POP QT_END_NAMESPACE + +#include "moc_qt3dquick3dextrasplugin.cpp" -- cgit v1.2.3 From f7b736bc3bb269f4f7de66ee0d3c1cf948858633 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:28 +0100 Subject: Qt3DLogic: includemocs Task-number: QTBUG-103286 Change-Id: Icf99f49f423c54c9db87510e8e1ae108bdc09f51 Reviewed-by: Sean Harmer (cherry picked from commit 3075885495513621fcd2418198b0308fd0f5406d) Reviewed-by: Qt Cherry-pick Bot --- src/logic/executor.cpp | 2 ++ src/logic/qframeaction.cpp | 2 ++ src/logic/qlogicaspect.cpp | 1 + 3 files changed, 5 insertions(+) diff --git a/src/logic/executor.cpp b/src/logic/executor.cpp index 27e2796d2..bf5c03c17 100644 --- a/src/logic/executor.cpp +++ b/src/logic/executor.cpp @@ -78,3 +78,5 @@ void Executor::processLogicFrameUpdates(const QVector &nodeIds, float d } // namespace Qt3DLogic QT_END_NAMESPACE + +#include "moc_executor_p.cpp" diff --git a/src/logic/qframeaction.cpp b/src/logic/qframeaction.cpp index 58cef86a7..4e8cc1d65 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 dd6cdbdcb..81e8fb67e 100644 --- a/src/logic/qlogicaspect.cpp +++ b/src/logic/qlogicaspect.cpp @@ -147,3 +147,4 @@ QT_END_NAMESPACE QT3D_REGISTER_NAMESPACED_ASPECT("logic", QT_PREPEND_NAMESPACE(Qt3DLogic), QLogicAspect) +#include "moc_qlogicaspect.cpp" -- cgit v1.2.3 From 46c76daa56a93173281286eb63c0d0cb81db8cd7 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:28 +0100 Subject: QtGLTFGeometryLoaderPlugin: includemocs Task-number: QTBUG-103286 Change-Id: I2c08611d03cc11b7d94be008cbc2205c817cf581 Reviewed-by: Sean Harmer (cherry picked from commit bb726e34da5126a695f43aa031a3cc5bc372d5c3) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp index 339bbbddb..a2c539787 100644 --- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp +++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp @@ -624,3 +624,5 @@ uint GLTFGeometryLoader::accessorDataSizeFromJson(const QString &type) } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_gltfgeometryloader.cpp" -- cgit v1.2.3 From eea595005c343c4a98ec8ac853e526d6939325a0 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:30 +0100 Subject: Qt3DAnimation: includemocs Task-number: QTBUG-103286 Change-Id: Iea60fab6a1dbc8910d1f4226265f861eddec859d Reviewed-by: Sean Harmer (cherry picked from commit b39992f4266a0f2374870354f991d3d61d2785cf) Reviewed-by: Qt Cherry-pick Bot --- src/animation/frontend/qabstractanimation.cpp | 2 ++ src/animation/frontend/qabstractanimationclip.cpp | 2 ++ src/animation/frontend/qabstractchannelmapping.cpp | 2 ++ src/animation/frontend/qabstractclipanimator.cpp | 2 ++ src/animation/frontend/qabstractclipblendnode.cpp | 2 ++ src/animation/frontend/qadditiveclipblend.cpp | 2 ++ src/animation/frontend/qanimationaspect.cpp | 2 ++ src/animation/frontend/qanimationclip.cpp | 2 ++ src/animation/frontend/qanimationcliploader.cpp | 2 ++ src/animation/frontend/qanimationcontroller.cpp | 2 ++ src/animation/frontend/qanimationgroup.cpp | 2 ++ src/animation/frontend/qblendedclipanimator.cpp | 2 ++ src/animation/frontend/qcallbackmapping.cpp | 2 ++ src/animation/frontend/qchannelmapper.cpp | 2 ++ src/animation/frontend/qchannelmapping.cpp | 2 ++ src/animation/frontend/qclipanimator.cpp | 2 ++ src/animation/frontend/qclipblendvalue.cpp | 2 ++ src/animation/frontend/qclock.cpp | 2 ++ src/animation/frontend/qkeyframeanimation.cpp | 2 ++ src/animation/frontend/qlerpclipblend.cpp | 2 ++ src/animation/frontend/qmorphinganimation.cpp | 2 ++ src/animation/frontend/qmorphtarget.cpp | 2 ++ src/animation/frontend/qskeletonmapping.cpp | 2 ++ src/animation/frontend/qvertexblendanimation.cpp | 2 ++ 24 files changed, 48 insertions(+) diff --git a/src/animation/frontend/qabstractanimation.cpp b/src/animation/frontend/qabstractanimation.cpp index 4744e2218..bc60611d9 100644 --- a/src/animation/frontend/qabstractanimation.cpp +++ b/src/animation/frontend/qabstractanimation.cpp @@ -187,3 +187,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 329ae0181..9ce83e60d 100644 --- a/src/animation/frontend/qabstractanimationclip.cpp +++ b/src/animation/frontend/qabstractanimationclip.cpp @@ -160,3 +160,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 e713befba..ce02c833b 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 01b023192..2f73ac521 100644 --- a/src/animation/frontend/qabstractclipanimator.cpp +++ b/src/animation/frontend/qabstractclipanimator.cpp @@ -342,3 +342,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 811488783..27b899e29 100644 --- a/src/animation/frontend/qabstractclipblendnode.cpp +++ b/src/animation/frontend/qabstractclipblendnode.cpp @@ -134,3 +134,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 e6e7ef5b0..e747e120e 100644 --- a/src/animation/frontend/qadditiveclipblend.cpp +++ b/src/animation/frontend/qadditiveclipblend.cpp @@ -252,3 +252,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 9c98cc90b..376e0348e 100644 --- a/src/animation/frontend/qanimationaspect.cpp +++ b/src/animation/frontend/qanimationaspect.cpp @@ -156,3 +156,5 @@ QVector 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 d4921cea6..2cf1a44b5 100644 --- a/src/animation/frontend/qanimationclip.cpp +++ b/src/animation/frontend/qanimationclip.cpp @@ -104,3 +104,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QAnimationClip::createNodeCreationChange() c } // namespace Qt3DAnimation QT_END_NAMESPACE + +#include "moc_qanimationclip.cpp" diff --git a/src/animation/frontend/qanimationcliploader.cpp b/src/animation/frontend/qanimationcliploader.cpp index f9a3e0611..6d8bbe2d3 100644 --- a/src/animation/frontend/qanimationcliploader.cpp +++ b/src/animation/frontend/qanimationcliploader.cpp @@ -158,3 +158,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QAnimationClipLoader::createNodeCreationChan } // namespace Qt3DAnimation QT_END_NAMESPACE + +#include "moc_qanimationcliploader.cpp" diff --git a/src/animation/frontend/qanimationcontroller.cpp b/src/animation/frontend/qanimationcontroller.cpp index ae8a1d39c..dc020040a 100644 --- a/src/animation/frontend/qanimationcontroller.cpp +++ b/src/animation/frontend/qanimationcontroller.cpp @@ -388,3 +388,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 8d02ef6be..a8ad12255 100644 --- a/src/animation/frontend/qanimationgroup.cpp +++ b/src/animation/frontend/qanimationgroup.cpp @@ -210,3 +210,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 28d00fd32..910b80a72 100644 --- a/src/animation/frontend/qblendedclipanimator.cpp +++ b/src/animation/frontend/qblendedclipanimator.cpp @@ -324,3 +324,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QBlendedClipAnimator::createNodeCreationChan } // namespace Qt3DAnimation QT_END_NAMESPACE + +#include "moc_qblendedclipanimator.cpp" diff --git a/src/animation/frontend/qcallbackmapping.cpp b/src/animation/frontend/qcallbackmapping.cpp index 7fbb64917..eabd68eb7 100644 --- a/src/animation/frontend/qcallbackmapping.cpp +++ b/src/animation/frontend/qcallbackmapping.cpp @@ -155,3 +155,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QCallbackMapping::createNodeCreationChange() } // namespace Qt3DAnimation QT_END_NAMESPACE + +#include "moc_qcallbackmapping.cpp" diff --git a/src/animation/frontend/qchannelmapper.cpp b/src/animation/frontend/qchannelmapper.cpp index ccbb5ed89..fffd83668 100644 --- a/src/animation/frontend/qchannelmapper.cpp +++ b/src/animation/frontend/qchannelmapper.cpp @@ -119,3 +119,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QChannelMapper::createNodeCreationChange() c } // namespace Qt3DAnimation QT_END_NAMESPACE + +#include "moc_qchannelmapper.cpp" diff --git a/src/animation/frontend/qchannelmapping.cpp b/src/animation/frontend/qchannelmapping.cpp index 64c4800b2..3706010b8 100644 --- a/src/animation/frontend/qchannelmapping.cpp +++ b/src/animation/frontend/qchannelmapping.cpp @@ -264,3 +264,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QChannelMapping::createNodeCreationChange() } // namespace Qt3DAnimation QT_END_NAMESPACE + +#include "moc_qchannelmapping.cpp" diff --git a/src/animation/frontend/qclipanimator.cpp b/src/animation/frontend/qclipanimator.cpp index 698d8a82f..350975b34 100644 --- a/src/animation/frontend/qclipanimator.cpp +++ b/src/animation/frontend/qclipanimator.cpp @@ -181,3 +181,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QClipAnimator::createNodeCreationChange() co } // namespace Qt3DAnimation QT_END_NAMESPACE + +#include "moc_qclipanimator.cpp" diff --git a/src/animation/frontend/qclipblendvalue.cpp b/src/animation/frontend/qclipblendvalue.cpp index bee110003..ab8af864c 100644 --- a/src/animation/frontend/qclipblendvalue.cpp +++ b/src/animation/frontend/qclipblendvalue.cpp @@ -132,3 +132,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QClipBlendValue::createNodeCreationChange() } // namespace Qt3DAnimation QT_END_NAMESPACE + +#include "moc_qclipblendvalue.cpp" diff --git a/src/animation/frontend/qclock.cpp b/src/animation/frontend/qclock.cpp index c4b6e135c..4286032e0 100644 --- a/src/animation/frontend/qclock.cpp +++ b/src/animation/frontend/qclock.cpp @@ -96,3 +96,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QClock::createNodeCreationChange() const } QT_END_NAMESPACE + +#include "moc_qclock.cpp" diff --git a/src/animation/frontend/qkeyframeanimation.cpp b/src/animation/frontend/qkeyframeanimation.cpp index d65ae1363..7d35d79f5 100644 --- a/src/animation/frontend/qkeyframeanimation.cpp +++ b/src/animation/frontend/qkeyframeanimation.cpp @@ -413,3 +413,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 d357848a6..daad28899 100644 --- a/src/animation/frontend/qlerpclipblend.cpp +++ b/src/animation/frontend/qlerpclipblend.cpp @@ -227,3 +227,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 6d9616b25..d45d3b539 100644 --- a/src/animation/frontend/qmorphinganimation.cpp +++ b/src/animation/frontend/qmorphinganimation.cpp @@ -451,3 +451,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 e8288028a..a572a3acb 100644 --- a/src/animation/frontend/qmorphtarget.cpp +++ b/src/animation/frontend/qmorphtarget.cpp @@ -187,3 +187,5 @@ QMorphTarget *QMorphTarget::fromGeometry(Qt3DRender::QGeometry *geometry, const } // Qt3DAnimation QT_END_NAMESPACE + +#include "moc_qmorphtarget.cpp" diff --git a/src/animation/frontend/qskeletonmapping.cpp b/src/animation/frontend/qskeletonmapping.cpp index a2f91c110..8ed3fffe1 100644 --- a/src/animation/frontend/qskeletonmapping.cpp +++ b/src/animation/frontend/qskeletonmapping.cpp @@ -106,3 +106,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QSkeletonMapping::createNodeCreationChange() } // namespace Qt3DAnimation QT_END_NAMESPACE + +#include "moc_qskeletonmapping.cpp" diff --git a/src/animation/frontend/qvertexblendanimation.cpp b/src/animation/frontend/qvertexblendanimation.cpp index 7f01d1d52..66a715dce 100644 --- a/src/animation/frontend/qvertexblendanimation.cpp +++ b/src/animation/frontend/qvertexblendanimation.cpp @@ -337,3 +337,5 @@ void QVertexBlendAnimation::updateAnimation(float position) } // Qt3DAnimation QT_END_NAMESPACE + +#include "moc_qvertexblendanimation.cpp" -- cgit v1.2.3 From ce07df7bbee3f019ae62daf032e5d858d33694dd Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:28 +0100 Subject: QtGLTFSceneImportPlugin: includemocs Task-number: QTBUG-103286 Change-Id: I988bf4324fb5844a6c2bb8f882a54816f64631ea Reviewed-by: Sean Harmer (cherry picked from commit 6d3fb7102f97136f72fe8eca63e6314bc404617f) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/sceneparsers/gltf/gltfimporter.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/sceneparsers/gltf/gltfimporter.cpp b/src/plugins/sceneparsers/gltf/gltfimporter.cpp index 73824fbf6..183b9ab3f 100644 --- a/src/plugins/sceneparsers/gltf/gltfimporter.cpp +++ b/src/plugins/sceneparsers/gltf/gltfimporter.cpp @@ -2628,4 +2628,5 @@ bool GLTFRawTextureImage::GLTFRawTextureImageFunctor::operator ==(const QTexture QT_END_NAMESPACE +#include "moc_gltfimporter.cpp" #include "gltfimporter.moc" -- cgit v1.2.3 From 6f8b2ed215fb5444370fb2e839bf29708a289555 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:31 +0100 Subject: Qt3DQuickExtras: includemocs Task-number: QTBUG-103286 Change-Id: Ia1d99ba57137a3108f0646fa4502de1ae0bc4070 Reviewed-by: Sean Harmer (cherry picked from commit 44cf93ae36f9bc1cc1699ad2752f6753def6cce1) Reviewed-by: Qt Cherry-pick Bot --- src/quick3d/quick3dextras/items/quick3dlevelofdetailloader.cpp | 2 ++ src/quick3d/quick3dextras/items/quick3dspritesheet.cpp | 2 ++ src/quick3d/quick3dextras/qt3dquickwindow.cpp | 1 + 3 files changed, 5 insertions(+) diff --git a/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader.cpp b/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader.cpp index bd2863321..8d84edbac 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 5bc53a019..97b7f6698 100644 --- a/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp +++ b/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp @@ -98,3 +98,5 @@ void Quick3DSpriteSheet::clearSprites(QQmlListProperty Date: Tue, 21 Jun 2022 10:59:27 +0100 Subject: Qt3DInput: includemocs Task-number: QTBUG-103286 Change-Id: Icee0b9d6964e3a3e076c2694a563666fa1b613d3 Reviewed-by: Sean Harmer (cherry picked from commit ae240f4a745c9a7429284a186726ae0900da63c0) Reviewed-by: Qt Cherry-pick Bot --- src/input/backend/keyboardmousegenericdeviceintegration.cpp | 2 ++ src/input/frontend/qabstractactioninput.cpp | 2 ++ src/input/frontend/qabstractaxisinput.cpp | 2 ++ src/input/frontend/qabstractphysicaldevice.cpp | 2 ++ src/input/frontend/qabstractphysicaldeviceproxy.cpp | 2 ++ src/input/frontend/qaction.cpp | 2 ++ src/input/frontend/qactioninput.cpp | 2 ++ src/input/frontend/qanalogaxisinput.cpp | 2 ++ src/input/frontend/qaxis.cpp | 2 ++ src/input/frontend/qaxisaccumulator.cpp | 2 ++ src/input/frontend/qaxissetting.cpp | 2 ++ src/input/frontend/qbuttonaxisinput.cpp | 2 ++ src/input/frontend/qgenericinputdevice.cpp | 2 ++ src/input/frontend/qinputaspect.cpp | 2 ++ src/input/frontend/qinputchord.cpp | 2 ++ src/input/frontend/qinputdeviceintegration.cpp | 2 ++ src/input/frontend/qinputdeviceplugin.cpp | 2 ++ src/input/frontend/qinputsequence.cpp | 2 ++ src/input/frontend/qinputsettings.cpp | 2 ++ src/input/frontend/qkeyboarddevice.cpp | 2 ++ src/input/frontend/qkeyboardhandler.cpp | 2 ++ src/input/frontend/qkeyevent.cpp | 2 ++ src/input/frontend/qlogicaldevice.cpp | 2 ++ src/input/frontend/qmousedevice.cpp | 2 ++ src/input/frontend/qmouseevent.cpp | 2 ++ src/input/frontend/qmousehandler.cpp | 2 ++ 26 files changed, 52 insertions(+) diff --git a/src/input/backend/keyboardmousegenericdeviceintegration.cpp b/src/input/backend/keyboardmousegenericdeviceintegration.cpp index e7d55484d..e88b477bc 100644 --- a/src/input/backend/keyboardmousegenericdeviceintegration.cpp +++ b/src/input/backend/keyboardmousegenericdeviceintegration.cpp @@ -100,3 +100,5 @@ QStringList KeyboardMouseGenericDeviceIntegration::deviceNames() const } // Qt3DInput QT_END_NAMESPACE + +#include "moc_keyboardmousegenericdeviceintegration_p.cpp" diff --git a/src/input/frontend/qabstractactioninput.cpp b/src/input/frontend/qabstractactioninput.cpp index 182be9acc..06f6a52a5 100644 --- a/src/input/frontend/qabstractactioninput.cpp +++ b/src/input/frontend/qabstractactioninput.cpp @@ -81,3 +81,5 @@ QAbstractActionInput::~QAbstractActionInput() } // Qt3DInput QT_END_NAMESPACE + +#include "moc_qabstractactioninput.cpp" diff --git a/src/input/frontend/qabstractaxisinput.cpp b/src/input/frontend/qabstractaxisinput.cpp index 4a29def45..bd1c86f05 100644 --- a/src/input/frontend/qabstractaxisinput.cpp +++ b/src/input/frontend/qabstractaxisinput.cpp @@ -121,3 +121,5 @@ QAbstractPhysicalDevice *QAbstractAxisInput::sourceDevice() const } // Qt3DInput QT_END_NAMESPACE + +#include "moc_qabstractaxisinput.cpp" diff --git a/src/input/frontend/qabstractphysicaldevice.cpp b/src/input/frontend/qabstractphysicaldevice.cpp index dda962d84..01013023b 100644 --- a/src/input/frontend/qabstractphysicaldevice.cpp +++ b/src/input/frontend/qabstractphysicaldevice.cpp @@ -221,3 +221,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QAbstractPhysicalDevice::createNodeCreationC } QT_END_NAMESPACE + +#include "moc_qabstractphysicaldevice.cpp" diff --git a/src/input/frontend/qabstractphysicaldeviceproxy.cpp b/src/input/frontend/qabstractphysicaldeviceproxy.cpp index d449bced0..839a13d7a 100644 --- a/src/input/frontend/qabstractphysicaldeviceproxy.cpp +++ b/src/input/frontend/qabstractphysicaldeviceproxy.cpp @@ -226,3 +226,5 @@ void QAbstractPhysicalDeviceProxyPrivate::resetDevice(QAbstractPhysicalDevice *d } // Qt3DInput QT_END_NAMESPACE + +#include "moc_qabstractphysicaldeviceproxy_p.cpp" diff --git a/src/input/frontend/qaction.cpp b/src/input/frontend/qaction.cpp index 885d21883..97ae6b352 100644 --- a/src/input/frontend/qaction.cpp +++ b/src/input/frontend/qaction.cpp @@ -164,3 +164,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QAction::createNodeCreationChange() const } // Qt3DInput QT_END_NAMESPACE + +#include "moc_qaction.cpp" diff --git a/src/input/frontend/qactioninput.cpp b/src/input/frontend/qactioninput.cpp index 8dc0264cb..d8c8f316c 100644 --- a/src/input/frontend/qactioninput.cpp +++ b/src/input/frontend/qactioninput.cpp @@ -213,3 +213,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QActionInput::createNodeCreationChange() con } // Qt3DInput QT_END_NAMESPACE + +#include "moc_qactioninput.cpp" diff --git a/src/input/frontend/qanalogaxisinput.cpp b/src/input/frontend/qanalogaxisinput.cpp index 584212ea8..c402a916f 100644 --- a/src/input/frontend/qanalogaxisinput.cpp +++ b/src/input/frontend/qanalogaxisinput.cpp @@ -124,3 +124,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QAnalogAxisInput::createNodeCreationChange() } // Qt3DInput QT_END_NAMESPACE + +#include "moc_qanalogaxisinput.cpp" diff --git a/src/input/frontend/qaxis.cpp b/src/input/frontend/qaxis.cpp index 38e9c4f9a..5f9481833 100644 --- a/src/input/frontend/qaxis.cpp +++ b/src/input/frontend/qaxis.cpp @@ -183,3 +183,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QAxis::createNodeCreationChange() const } // Qt3DInput QT_END_NAMESPACE + +#include "moc_qaxis.cpp" diff --git a/src/input/frontend/qaxisaccumulator.cpp b/src/input/frontend/qaxisaccumulator.cpp index f261007ee..9c41c16cf 100644 --- a/src/input/frontend/qaxisaccumulator.cpp +++ b/src/input/frontend/qaxisaccumulator.cpp @@ -309,3 +309,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QAxisAccumulator::createNodeCreationChange() } // namespace Qt3DInput QT_END_NAMESPACE + +#include "moc_qaxisaccumulator.cpp" diff --git a/src/input/frontend/qaxissetting.cpp b/src/input/frontend/qaxissetting.cpp index acb2bef59..8142a6543 100644 --- a/src/input/frontend/qaxissetting.cpp +++ b/src/input/frontend/qaxissetting.cpp @@ -242,3 +242,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QAxisSetting::createNodeCreationChange() con } // namespace Qt3DInput QT_END_NAMESPACE + +#include "moc_qaxissetting.cpp" diff --git a/src/input/frontend/qbuttonaxisinput.cpp b/src/input/frontend/qbuttonaxisinput.cpp index 21e9fad23..76cec3c58 100644 --- a/src/input/frontend/qbuttonaxisinput.cpp +++ b/src/input/frontend/qbuttonaxisinput.cpp @@ -194,3 +194,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QButtonAxisInput::createNodeCreationChange() } // Qt3DInput QT_END_NAMESPACE + +#include "moc_qbuttonaxisinput.cpp" diff --git a/src/input/frontend/qgenericinputdevice.cpp b/src/input/frontend/qgenericinputdevice.cpp index 90e94e014..1162db997 100644 --- a/src/input/frontend/qgenericinputdevice.cpp +++ b/src/input/frontend/qgenericinputdevice.cpp @@ -98,3 +98,5 @@ void QGenericInputDevice::setButtonsMap(const QVariantMap &buttonsMap) } // Qt3DInput QT_END_NAMESPACE + +#include "moc_qgenericinputdevice_p.cpp" diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp index 8a348e3da..2101b37a0 100644 --- a/src/input/frontend/qinputaspect.cpp +++ b/src/input/frontend/qinputaspect.cpp @@ -316,3 +316,5 @@ void QInputAspect::onUnregistered() QT_END_NAMESPACE QT3D_REGISTER_NAMESPACED_ASPECT("input", QT_PREPEND_NAMESPACE(Qt3DInput), QInputAspect) + +#include "moc_qinputaspect.cpp" diff --git a/src/input/frontend/qinputchord.cpp b/src/input/frontend/qinputchord.cpp index 92dc3b628..8c6ab3596 100644 --- a/src/input/frontend/qinputchord.cpp +++ b/src/input/frontend/qinputchord.cpp @@ -206,3 +206,5 @@ QInputChordPrivate::QInputChordPrivate() } // Qt3DInput QT_END_NAMESPACE + +#include "moc_qinputchord.cpp" diff --git a/src/input/frontend/qinputdeviceintegration.cpp b/src/input/frontend/qinputdeviceintegration.cpp index 63700b74a..d378dfa46 100644 --- a/src/input/frontend/qinputdeviceintegration.cpp +++ b/src/input/frontend/qinputdeviceintegration.cpp @@ -127,3 +127,5 @@ QInputAspect *QInputDeviceIntegration::inputAspect() const */ QT_END_NAMESPACE + +#include "moc_qinputdeviceintegration_p.cpp" diff --git a/src/input/frontend/qinputdeviceplugin.cpp b/src/input/frontend/qinputdeviceplugin.cpp index 4889b383a..a8c29e571 100644 --- a/src/input/frontend/qinputdeviceplugin.cpp +++ b/src/input/frontend/qinputdeviceplugin.cpp @@ -62,3 +62,5 @@ QInputDeviceIntegration *QInputDevicePlugin::create(const QString &key, const QS } // Qt3DInput QT_END_NAMESPACE + +#include "moc_qinputdeviceplugin_p.cpp" diff --git a/src/input/frontend/qinputsequence.cpp b/src/input/frontend/qinputsequence.cpp index e34d927fe..4bcf58bd1 100644 --- a/src/input/frontend/qinputsequence.cpp +++ b/src/input/frontend/qinputsequence.cpp @@ -254,3 +254,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QInputSequence::createNodeCreationChange() c } // Qt3DInput QT_END_NAMESPACE + +#include "moc_qinputsequence.cpp" diff --git a/src/input/frontend/qinputsettings.cpp b/src/input/frontend/qinputsettings.cpp index 4a55b4ab8..c2a301109 100644 --- a/src/input/frontend/qinputsettings.cpp +++ b/src/input/frontend/qinputsettings.cpp @@ -147,3 +147,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QInputSettings::createNodeCreationChange() c QT_END_NAMESPACE + +#include "moc_qinputsettings.cpp" diff --git a/src/input/frontend/qkeyboarddevice.cpp b/src/input/frontend/qkeyboarddevice.cpp index e091e201a..3fafadafa 100644 --- a/src/input/frontend/qkeyboarddevice.cpp +++ b/src/input/frontend/qkeyboarddevice.cpp @@ -329,3 +329,5 @@ void QKeyboardDevice::setActiveInput(QKeyboardHandler *activeInput) } // namespace Qt3DInput QT_END_NAMESPACE + +#include "moc_qkeyboarddevice.cpp" diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp index 25171119b..d89060509 100644 --- a/src/input/frontend/qkeyboardhandler.cpp +++ b/src/input/frontend/qkeyboardhandler.cpp @@ -738,3 +738,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QKeyboardHandler::createNodeCreationChange() } // namespace Qt3DInput QT_END_NAMESPACE + +#include "moc_qkeyboardhandler.cpp" diff --git a/src/input/frontend/qkeyevent.cpp b/src/input/frontend/qkeyevent.cpp index 818338631..83082f68e 100644 --- a/src/input/frontend/qkeyevent.cpp +++ b/src/input/frontend/qkeyevent.cpp @@ -249,3 +249,5 @@ QKeyEvent::~QKeyEvent() } // namespace Qt3DInput QT_END_NAMESPACE + +#include "moc_qkeyevent.cpp" diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp index 5d1fc06b0..2997c8984 100644 --- a/src/input/frontend/qlogicaldevice.cpp +++ b/src/input/frontend/qlogicaldevice.cpp @@ -265,3 +265,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QLogicalDevice::createNodeCreationChange() c } // Qt3DInput QT_END_NAMESPACE + +#include "moc_qlogicaldevice.cpp" diff --git a/src/input/frontend/qmousedevice.cpp b/src/input/frontend/qmousedevice.cpp index 36d2f8b5c..a0f3e7626 100644 --- a/src/input/frontend/qmousedevice.cpp +++ b/src/input/frontend/qmousedevice.cpp @@ -280,3 +280,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QMouseDevice::createNodeCreationChange() con } // namespace Qt3DInput QT_END_NAMESPACE + +#include "moc_qmousedevice.cpp" diff --git a/src/input/frontend/qmouseevent.cpp b/src/input/frontend/qmouseevent.cpp index 368bce171..5334b9d7a 100644 --- a/src/input/frontend/qmouseevent.cpp +++ b/src/input/frontend/qmouseevent.cpp @@ -507,3 +507,5 @@ QWheelEvent::Modifiers QWheelEvent::modifiers() const } // namespace Qt3DInput QT_END_NAMESPACE + +#include "moc_qmouseevent.cpp" diff --git a/src/input/frontend/qmousehandler.cpp b/src/input/frontend/qmousehandler.cpp index 42f7d6a11..721ef368f 100644 --- a/src/input/frontend/qmousehandler.cpp +++ b/src/input/frontend/qmousehandler.cpp @@ -354,3 +354,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QMouseHandler::createNodeCreationChange() co } // namespace Qt3DInput QT_END_NAMESPACE + +#include "moc_qmousehandler.cpp" -- cgit v1.2.3 From ac418e8bca0767254fa26a248730417af5b3132f Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:32 +0100 Subject: Qt3DQuickAnimation: includemocs Task-number: QTBUG-103286 Change-Id: I3cc1eb16e1986ffb5f908a60f6f333cf33b9a347 Reviewed-by: Sean Harmer (cherry picked from commit 4af3641935144d59544b6856a1b1561673800b01) Reviewed-by: Qt Cherry-pick Bot --- src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp | 2 ++ src/quick3d/quick3danimation/items/quick3danimationgroup.cpp | 2 ++ src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp | 2 ++ src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp | 2 ++ src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp | 2 ++ src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp | 2 ++ src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp | 2 ++ 7 files changed, 14 insertions(+) diff --git a/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp b/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp index 8ffc38981..734b5d2f5 100644 --- a/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp +++ b/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp @@ -93,3 +93,5 @@ void QQuick3DAnimationController::clearAnimationGroups(QQmlListProperty Date: Tue, 21 Jun 2022 10:59:32 +0100 Subject: Qtqtquickscene3dplugin: includemocs Task-number: QTBUG-103286 Change-Id: I76bb0f856fb6b34fae3193851c0af54f37d384aa Reviewed-by: Sean Harmer (cherry picked from commit 1aeed8133c4b9ea1be4405a354d7ebc0e59beaa7) Reviewed-by: Qt Cherry-pick Bot --- src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp | 2 ++ src/quick3d/imports/scene3d/scene3ditem.cpp | 1 + src/quick3d/imports/scene3d/scene3drenderer.cpp | 2 ++ 3 files changed, 5 insertions(+) diff --git a/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp b/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp index e6eacd400..9012da6a0 100644 --- a/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp +++ b/src/quick3d/imports/scene3d/qtquickscene3dplugin.cpp @@ -57,3 +57,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 1de97679d..0a5d1f079 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -1014,4 +1014,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 577fc3e1b..46af9801a 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer.cpp +++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp @@ -400,3 +400,5 @@ void Scene3DRenderer::render() } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_scene3drenderer_p.cpp" -- cgit v1.2.3 From ad6160f88a60d3f8fede488dd7389943801fa758 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 15:32:46 +0100 Subject: Qtqtquick3dcoreplugin: includemocs Task-number: QTBUG-103286 Change-Id: Ibe5d4e822c418f901bd7790cc73e6116bcca1aab Reviewed-by: Sean Harmer (cherry picked from commit d4b8a64153090d896fe47bd15ca4cb0403cb4a88) Reviewed-by: Qt Cherry-pick Bot --- src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp index b82e06fca..1e2a2b260 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp @@ -94,3 +94,5 @@ Qt3DQuick3DCorePlugin::~Qt3DQuick3DCorePlugin() } QT_END_NAMESPACE + +#include "moc_qt3dquick3dcoreplugin.cpp" -- cgit v1.2.3 From 1dbbe132acaa7099241dcc4dc0d3627cfab17b2c Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:28 +0100 Subject: QtDefaultGeometryLoaderPlugin: includemocs Task-number: QTBUG-103286 Change-Id: Ifb6790d17259efdaaa300246c7333deed38a6e63 Reviewed-by: Sean Harmer (cherry picked from commit dccb5556a33da71a40de490686db681b19f1bc96) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/geometryloaders/default/basegeometryloader.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/geometryloaders/default/basegeometryloader.cpp b/src/plugins/geometryloaders/default/basegeometryloader.cpp index 57bbc8748..f2d090f1e 100644 --- a/src/plugins/geometryloaders/default/basegeometryloader.cpp +++ b/src/plugins/geometryloaders/default/basegeometryloader.cpp @@ -278,3 +278,5 @@ void BaseGeometryLoader::center(QVector& points) } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_basegeometryloader_p.cpp" -- cgit v1.2.3 From ed5831c2f9d6e1c298d5369e9f38ca99d62b0159 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:28 +0100 Subject: QtAssimpSceneImportPlugin: includemocs Task-number: QTBUG-103286 Change-Id: I19c4d8e281eca3d62be902c7b0c43e5efd024bcd Reviewed-by: Sean Harmer (cherry picked from commit e6e2938535c121bbb605c5e8c62ecd3ca13db435) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/sceneparsers/assimp/assimpimporter.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp index b450e6ab6..ff48e7845 100644 --- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp +++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp @@ -1391,4 +1391,6 @@ AssimpImporter::SceneImporter::~SceneImporter() QT_END_NAMESPACE +#include "moc_assimpimporter.cpp" + #include "assimpimporter.moc" -- cgit v1.2.3 From f3e1da78cd2d40c50083a2890d53d558e2483daf Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:30 +0100 Subject: Qt3DQuickInput: includemocs Task-number: QTBUG-103286 Change-Id: I7a9daae16e505db50c0f17947e13694f741d8938 Reviewed-by: Sean Harmer (cherry picked from commit dc42423a378753c00be4346831b77d2bc44f5db5) Reviewed-by: Qt Cherry-pick Bot --- src/quick3d/quick3dinput/items/quick3daction.cpp | 2 ++ src/quick3d/quick3dinput/items/quick3daxis.cpp | 2 ++ src/quick3d/quick3dinput/items/quick3dinputchord.cpp | 2 ++ src/quick3d/quick3dinput/items/quick3dinputsequence.cpp | 2 ++ src/quick3d/quick3dinput/items/quick3dlogicaldevice.cpp | 2 ++ src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp | 2 ++ 6 files changed, 12 insertions(+) diff --git a/src/quick3d/quick3dinput/items/quick3daction.cpp b/src/quick3d/quick3dinput/items/quick3daction.cpp index 2aa0982c0..aa53782a7 100644 --- a/src/quick3d/quick3dinput/items/quick3daction.cpp +++ b/src/quick3d/quick3dinput/items/quick3daction.cpp @@ -91,3 +91,5 @@ void Quick3DAction::clearActionInputs(QQmlListProperty *li } // 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 996ab7e33..0519ee113 100644 --- a/src/quick3d/quick3dinput/items/quick3daxis.cpp +++ b/src/quick3d/quick3dinput/items/quick3daxis.cpp @@ -91,3 +91,5 @@ void Quick3DAxis::clearAxisInputs(QQmlListProperty *list) } // 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 87090c3da..e91055468 100644 --- a/src/quick3d/quick3dinput/items/quick3dinputchord.cpp +++ b/src/quick3d/quick3dinput/items/quick3dinputchord.cpp @@ -90,3 +90,5 @@ void Quick3DInputChord::clearActionInputs(QQmlListProperty } // 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 358be395e..bbcf059ee 100644 --- a/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp +++ b/src/quick3d/quick3dinput/items/quick3dinputsequence.cpp @@ -91,3 +91,5 @@ void Quick3DInputSequence::clearActionInputs(QQmlListProperty *list) } // 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 3628e09fc..9221a6b11 100644 --- a/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp +++ b/src/quick3d/quick3dinput/items/quick3dphysicaldevice.cpp @@ -90,3 +90,5 @@ void Quick3DPhysicalDevice::clearAxisSettings(QQmlListProperty *li } // namespace Qt3DInput QT_END_NAMESPACE + +#include "moc_quick3dphysicaldevice_p.cpp" -- cgit v1.2.3 From ba66ffedcc333ad1d264004d06a318ca32bb38f8 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:31 +0100 Subject: Qtquick3dinputplugin: includemocs Task-number: QTBUG-103286 Change-Id: I0ae90b5447bafe917112fe446d50fc1d5e1aeb8e Reviewed-by: Sean Harmer (cherry picked from commit 4df4dd5ff267326012e02b1dd419f3ce9a1d2860) Reviewed-by: Qt Cherry-pick Bot --- src/quick3d/imports/input/qt3dquick3dinputplugin.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp index b009b48d0..f73836cdf 100644 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp +++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp @@ -111,3 +111,5 @@ void Qt3DQuick3DInputPlugin::registerTypes(const char *uri) } QT_END_NAMESPACE + +#include "moc_qt3dquick3dinputplugin.cpp" -- cgit v1.2.3 From 0f96ee354477a8d28fd7225b43721ae21f562549 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:31 +0100 Subject: Qtquick3drenderplugin: includemocs Task-number: QTBUG-103286 Change-Id: Ie916f27ced030efec052121084e8e9d87105f015 Reviewed-by: Sean Harmer (cherry picked from commit bfbe7f3bf11dc6746c4e1b52d1d62016f09d3295) Reviewed-by: Qt Cherry-pick Bot --- src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index fed859f11..d2d1a9fda 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -330,4 +330,6 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) QT_END_NAMESPACE +#include "moc_qt3dquick3drenderplugin.cpp" + -- cgit v1.2.3 From 5fabce597be833423536b97a5fef79297041e62b Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:31 +0100 Subject: Qtquick3dlogicplugin: includemocs Task-number: QTBUG-103286 Change-Id: I78e1a67a974297fc4c8220cf4a44641d2f8ad6ce Reviewed-by: Sean Harmer (cherry picked from commit 8c5f6d4de583cfea4caaa24bcaf5c739b7f0ecf5) Reviewed-by: Qt Cherry-pick Bot --- src/quick3d/imports/logic/qt3dquick3dlogicplugin.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/quick3d/imports/logic/qt3dquick3dlogicplugin.cpp b/src/quick3d/imports/logic/qt3dquick3dlogicplugin.cpp index 0aed4b290..d1d307837 100644 --- a/src/quick3d/imports/logic/qt3dquick3dlogicplugin.cpp +++ b/src/quick3d/imports/logic/qt3dquick3dlogicplugin.cpp @@ -53,3 +53,5 @@ void Qt3DQuick3DLogicPlugin::registerTypes(const char *uri) } QT_END_NAMESPACE + +#include "moc_qt3dquick3dlogicplugin.cpp" -- cgit v1.2.3 From e6fda5a82b43b8073cd376ab21e4051548269aea Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:32 +0100 Subject: Qtquick3danimationplugin: includemocs Task-number: QTBUG-103286 Change-Id: I7d79f1ab9724d2a33a3078d8b387502756d4a6d4 Reviewed-by: Sean Harmer (cherry picked from commit 353f352a908ff71d180b347247bd9b81593c59ce) Reviewed-by: Qt Cherry-pick Bot --- src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp index a8882495a..6fb1b42f0 100644 --- a/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp +++ b/src/quick3d/imports/animation/qt3dquick3danimationplugin.cpp @@ -107,3 +107,5 @@ void Qt3DQuick3DAnimationPlugin::registerTypes(const char *uri) } QT_END_NAMESPACE + +#include "moc_qt3dquick3danimationplugin.cpp" -- cgit v1.2.3 From 90dcce4f8703aa0bda39a9c642002ae3f16edf53 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:27 +0100 Subject: Qt3DCore: includemocs Task-number: QTBUG-103286 Change-Id: Ifca1713c5e2f3582788a8f0537621e166bda4492 Reviewed-by: Sean Harmer (cherry picked from commit 223c56a525d26a2e21f5acfe5bdc756053c3fd3b) Reviewed-by: Paul Lemire --- src/core/aspects/aspectcommanddebugger.cpp | 2 ++ src/core/aspects/qabstractaspect.cpp | 4 ++++ src/core/aspects/qaspectengine.cpp | 2 ++ src/core/aspects/qaspectmanager.cpp | 2 ++ src/core/jobs/qabstractaspectjobmanager.cpp | 2 ++ src/core/jobs/qaspectjobmanager.cpp | 2 ++ src/core/jobs/qthreadpooler.cpp | 2 ++ src/core/nodes/propertychangehandler.cpp | 2 ++ src/core/nodes/qcomponent.cpp | 2 ++ src/core/nodes/qentity.cpp | 2 ++ src/core/nodes/qnode.cpp | 2 ++ src/core/qchangearbiter.cpp | 2 ++ src/core/qscheduler.cpp | 2 ++ src/core/services/qabstractframeadvanceservice.cpp | 2 ++ src/core/services/qdownloadnetworkworker.cpp | 2 ++ src/core/services/qeventfilterservice.cpp | 2 ++ src/core/services/qopenglinformationservice.cpp | 2 ++ src/core/services/qservicelocator.cpp | 2 ++ src/core/services/qsysteminformationservice.cpp | 2 ++ src/core/services/qtickclockservice.cpp | 2 ++ src/core/transforms/qabstractskeleton.cpp | 2 ++ src/core/transforms/qarmature.cpp | 2 ++ src/core/transforms/qjoint.cpp | 2 ++ src/core/transforms/qskeleton.cpp | 2 ++ src/core/transforms/qskeletonloader.cpp | 2 ++ 25 files changed, 52 insertions(+) diff --git a/src/core/aspects/aspectcommanddebugger.cpp b/src/core/aspects/aspectcommanddebugger.cpp index a61fca225..20819a3b8 100644 --- a/src/core/aspects/aspectcommanddebugger.cpp +++ b/src/core/aspects/aspectcommanddebugger.cpp @@ -204,3 +204,5 @@ void AspectCommandDebugger::executeCommand(const QString &command, } // Qt3DCore QT_END_NAMESPACE + +#include "moc_aspectcommanddebugger_p.cpp" diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index 13c3449c4..c986883f9 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -591,3 +591,7 @@ void AsynchronousCommandReply::setData(const QByteArray &data) } // of namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qabstractaspect_p.cpp" + +#include "moc_qabstractaspect.cpp" diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp index 22716c6c8..c68bea24b 100644 --- a/src/core/aspects/qaspectengine.cpp +++ b/src/core/aspects/qaspectengine.cpp @@ -522,3 +522,5 @@ QAspectEngine::RunMode QAspectEngine::runMode() const } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qaspectengine.cpp" diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp index 7f4fc208c..f18ab90f6 100644 --- a/src/core/aspects/qaspectmanager.cpp +++ b/src/core/aspects/qaspectmanager.cpp @@ -554,3 +554,5 @@ void QAspectManager::processFrame() } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qaspectmanager_p.cpp" diff --git a/src/core/jobs/qabstractaspectjobmanager.cpp b/src/core/jobs/qabstractaspectjobmanager.cpp index 3199723f8..ed060a119 100644 --- a/src/core/jobs/qabstractaspectjobmanager.cpp +++ b/src/core/jobs/qabstractaspectjobmanager.cpp @@ -57,3 +57,5 @@ QAbstractAspectJobManager::QAbstractAspectJobManager(QObject *parent) } QT_END_NAMESPACE + +#include "moc_qabstractaspectjobmanager_p.cpp" diff --git a/src/core/jobs/qaspectjobmanager.cpp b/src/core/jobs/qaspectjobmanager.cpp index 9340aade4..51073e3d1 100644 --- a/src/core/jobs/qaspectjobmanager.cpp +++ b/src/core/jobs/qaspectjobmanager.cpp @@ -131,3 +131,5 @@ void QAspectJobManager::waitForPerThreadFunction(JobFunction func, void *arg) } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qaspectjobmanager_p.cpp" diff --git a/src/core/jobs/qthreadpooler.cpp b/src/core/jobs/qthreadpooler.cpp index 79bda2971..4c75431ce 100644 --- a/src/core/jobs/qthreadpooler.cpp +++ b/src/core/jobs/qthreadpooler.cpp @@ -220,3 +220,5 @@ int QThreadPooler::maxThreadCount() } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qthreadpooler_p.cpp" diff --git a/src/core/nodes/propertychangehandler.cpp b/src/core/nodes/propertychangehandler.cpp index 6737bb2c2..a51d6708e 100644 --- a/src/core/nodes/propertychangehandler.cpp +++ b/src/core/nodes/propertychangehandler.cpp @@ -84,3 +84,5 @@ void PropertyChangeHandlerBase::disconnectFromPropertyChange(const QObject *obje } QT_END_NAMESPACE + +#include "moc_propertychangehandler_p.cpp" diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp index 3176516b7..68b3fe6c8 100644 --- a/src/core/nodes/qcomponent.cpp +++ b/src/core/nodes/qcomponent.cpp @@ -190,3 +190,5 @@ QComponent::QComponent(QComponentPrivate &dd, QNode *parent) */ QT_END_NAMESPACE + +#include "moc_qcomponent.cpp" diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp index 7abc3f7c1..b60864636 100644 --- a/src/core/nodes/qentity.cpp +++ b/src/core/nodes/qentity.cpp @@ -338,3 +338,5 @@ void QEntity::onParentChanged(QObject *) } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qentity.cpp" diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp index 596b5c6d8..7bc887bcd 100644 --- a/src/core/nodes/qnode.cpp +++ b/src/core/nodes/qnode.cpp @@ -1219,4 +1219,6 @@ void NodePostConstructorInit::processNodes() QT_END_NAMESPACE +#include "moc_qnode_p.cpp" + #include "moc_qnode.cpp" diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp index 1671b87ec..fa2c0ffc5 100644 --- a/src/core/qchangearbiter.cpp +++ b/src/core/qchangearbiter.cpp @@ -354,3 +354,5 @@ void QChangeArbiter::destroyThreadLocalChangeQueue(void *changeArbiter) } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qchangearbiter_p.cpp" diff --git a/src/core/qscheduler.cpp b/src/core/qscheduler.cpp index f45dddd49..92133833d 100644 --- a/src/core/qscheduler.cpp +++ b/src/core/qscheduler.cpp @@ -152,3 +152,5 @@ int QScheduler::scheduleAndWaitForFrameAspectJobs(qint64 time, bool dumpJobs) } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qscheduler_p.cpp" diff --git a/src/core/services/qabstractframeadvanceservice.cpp b/src/core/services/qabstractframeadvanceservice.cpp index 1c6898119..2088f937f 100644 --- a/src/core/services/qabstractframeadvanceservice.cpp +++ b/src/core/services/qabstractframeadvanceservice.cpp @@ -91,3 +91,5 @@ QAbstractFrameAdvanceService::QAbstractFrameAdvanceService(QAbstractFrameAdvance } // Qt3D QT_END_NAMESPACE + +#include "moc_qabstractframeadvanceservice_p.cpp" diff --git a/src/core/services/qdownloadnetworkworker.cpp b/src/core/services/qdownloadnetworkworker.cpp index 7c9df1345..2112f1be9 100644 --- a/src/core/services/qdownloadnetworkworker.cpp +++ b/src/core/services/qdownloadnetworkworker.cpp @@ -146,3 +146,5 @@ void QDownloadNetworkWorker::onDownloadProgressed(qint64 bytesReceived, qint64 b QT_END_NAMESPACE +#include "moc_qdownloadnetworkworker_p.cpp" + diff --git a/src/core/services/qeventfilterservice.cpp b/src/core/services/qeventfilterservice.cpp index 0de86a425..e23084323 100644 --- a/src/core/services/qeventfilterservice.cpp +++ b/src/core/services/qeventfilterservice.cpp @@ -187,4 +187,6 @@ bool InternalEventListener::eventFilter(QObject *obj, QEvent *e) QT_END_NAMESPACE +#include "moc_qeventfilterservice_p.cpp" + #include "qeventfilterservice.moc" diff --git a/src/core/services/qopenglinformationservice.cpp b/src/core/services/qopenglinformationservice.cpp index 13a4552c8..97451ef1c 100644 --- a/src/core/services/qopenglinformationservice.cpp +++ b/src/core/services/qopenglinformationservice.cpp @@ -84,3 +84,5 @@ QOpenGLInformationService::QOpenGLInformationService(QOpenGLInformationServicePr } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qopenglinformationservice_p.cpp" diff --git a/src/core/services/qservicelocator.cpp b/src/core/services/qservicelocator.cpp index c25023dfc..f2a2513f5 100644 --- a/src/core/services/qservicelocator.cpp +++ b/src/core/services/qservicelocator.cpp @@ -267,3 +267,5 @@ QAbstractServiceProvider *QServiceLocator::_q_getServiceHelper(int type) } QT_END_NAMESPACE + +#include "moc_qservicelocator_p.cpp" diff --git a/src/core/services/qsysteminformationservice.cpp b/src/core/services/qsysteminformationservice.cpp index 7932ec359..d6df42601 100644 --- a/src/core/services/qsysteminformationservice.cpp +++ b/src/core/services/qsysteminformationservice.cpp @@ -436,3 +436,5 @@ void QSystemInformationService::dumpCommand(const QString &command) } QT_END_NAMESPACE + +#include "moc_qsysteminformationservice_p.cpp" diff --git a/src/core/services/qtickclockservice.cpp b/src/core/services/qtickclockservice.cpp index aa55abfcb..26dfe14e4 100644 --- a/src/core/services/qtickclockservice.cpp +++ b/src/core/services/qtickclockservice.cpp @@ -98,3 +98,5 @@ void QTickClockService::stop() } // Qt3D QT_END_NAMESPACE + +#include "moc_qtickclockservice_p.cpp" diff --git a/src/core/transforms/qabstractskeleton.cpp b/src/core/transforms/qabstractskeleton.cpp index f1b0ba2e5..302f74753 100644 --- a/src/core/transforms/qabstractskeleton.cpp +++ b/src/core/transforms/qabstractskeleton.cpp @@ -137,3 +137,5 @@ void QAbstractSkeletonPrivate::setJointCount(int jointCount) } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qabstractskeleton.cpp" diff --git a/src/core/transforms/qarmature.cpp b/src/core/transforms/qarmature.cpp index 01d5b6b82..742260c82 100644 --- a/src/core/transforms/qarmature.cpp +++ b/src/core/transforms/qarmature.cpp @@ -170,3 +170,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QArmature::createNodeCreationChange() const } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qarmature.cpp" diff --git a/src/core/transforms/qjoint.cpp b/src/core/transforms/qjoint.cpp index 8e8c26ee6..145b28bcf 100644 --- a/src/core/transforms/qjoint.cpp +++ b/src/core/transforms/qjoint.cpp @@ -408,3 +408,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QJoint::createNodeCreationChange() const } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qjoint.cpp" diff --git a/src/core/transforms/qskeleton.cpp b/src/core/transforms/qskeleton.cpp index b778a9128..f24352e4f 100644 --- a/src/core/transforms/qskeleton.cpp +++ b/src/core/transforms/qskeleton.cpp @@ -150,3 +150,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QSkeleton::createNodeCreationChange() const } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qskeleton.cpp" diff --git a/src/core/transforms/qskeletonloader.cpp b/src/core/transforms/qskeletonloader.cpp index 35b547f24..aa5708721 100644 --- a/src/core/transforms/qskeletonloader.cpp +++ b/src/core/transforms/qskeletonloader.cpp @@ -261,3 +261,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QSkeletonLoader::createNodeCreationChange() } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qskeletonloader.cpp" -- cgit v1.2.3 From 34386672a58799d5ea7f1d9e6aa4b3896824b7f4 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 6 Jul 2022 08:39:09 +0200 Subject: Fix various [=] lambda captures to capture [this] instead C++20 deprecated the implicit capture of [this] in [=]. Move Q_D()s into the lambdas, where applicable. Change-Id: I345658b0ab9c4edc070f6fd111fce135dd757b14 Reviewed-by: Paul Lemire (cherry picked from commit 42f96fe2074bc63cfb8a4ae71a7262d554661da2) Reviewed-by: Qt Cherry-pick Bot --- src/extras/defaults/qabstractcameracontroller.cpp | 3 ++- src/render/framegraph/qrendersurfaceselector.cpp | 2 +- src/render/texture/qtexture.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/extras/defaults/qabstractcameracontroller.cpp b/src/extras/defaults/qabstractcameracontroller.cpp index 11d0588c5..c1053d2b7 100644 --- a/src/extras/defaults/qabstractcameracontroller.cpp +++ b/src/extras/defaults/qabstractcameracontroller.cpp @@ -285,7 +285,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/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp index 12a80e8ce..c374e993c 100644 --- a/src/render/framegraph/qrendersurfaceselector.cpp +++ b/src/render/framegraph/qrendersurfaceselector.cpp @@ -257,7 +257,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())); }); diff --git a/src/render/texture/qtexture.cpp b/src/render/texture/qtexture.cpp index 45032ae7e..bfd7b4346 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(); }; -- cgit v1.2.3 From c80622cfd8336d3f17599d73a0214174e1ba1664 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 8 Jul 2022 16:58:11 +0200 Subject: FilterKey: fix ambiguous relational operators in C++20 The member operators weren't const, leading them to be ambiguous with their reversed versions. Fix by adding a private equals() function (to avoid churning the implementation) and making the relational operators hidden friends. Task-number: QTBUG-104172 Change-Id: I97e74ef26fc2712d6f97c8f7d7bd61d6a625b42e Reviewed-by: Paul Lemire (cherry picked from commit bcd20a74c9f2cd5920ecc5c1c0bb6d577db6cb50) Reviewed-by: Qt Cherry-pick Bot --- src/render/materialsystem/filterkey.cpp | 7 +------ src/render/materialsystem/filterkey_p.h | 9 +++++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/render/materialsystem/filterkey.cpp b/src/render/materialsystem/filterkey.cpp index eb662b409..4a4d309f6 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; @@ -97,11 +97,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 fc9a0909d..a4d147a5d 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; }; -- cgit v1.2.3 From 6c5185dc4343bfc927a1a2dda43e4df58a89aa0c Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:30 +0100 Subject: Qt3DRender: includemocs Task-number: QTBUG-103286 Change-Id: Iaddad08bb469408ee975e463ac82c95870130cee Reviewed-by: Sean Harmer (cherry picked from commit 1e940bf2f8d260c313917718584736fa9fa86b14) Reviewed-by: Paul Lemire --- src/quick3d/quick3drender/items/quick3dbuffer.cpp | 2 ++ src/render/backend/offscreensurfacehelper.cpp | 2 ++ src/render/backend/platformsurfacefilter.cpp | 2 ++ src/render/framegraph/qblitframebuffer.cpp | 2 ++ src/render/framegraph/qbuffercapture.cpp | 2 ++ src/render/framegraph/qcameraselector.cpp | 2 ++ src/render/framegraph/qclearbuffers.cpp | 2 ++ src/render/framegraph/qdebugoverlay.cpp | 2 ++ src/render/framegraph/qdispatchcompute.cpp | 2 ++ src/render/framegraph/qframegraphnode.cpp | 2 ++ src/render/framegraph/qfrustumculling.cpp | 2 ++ src/render/framegraph/qlayerfilter.cpp | 2 ++ src/render/framegraph/qmemorybarrier.cpp | 2 ++ src/render/framegraph/qnodraw.cpp | 2 ++ src/render/framegraph/qnopicking.cpp | 2 ++ src/render/framegraph/qproximityfilter.cpp | 2 ++ src/render/framegraph/qrendercapture.cpp | 2 ++ src/render/framegraph/qrenderpassfilter.cpp | 2 ++ src/render/framegraph/qrenderstateset.cpp | 2 ++ src/render/framegraph/qrendersurfaceselector.cpp | 2 ++ src/render/framegraph/qrendertargetselector.cpp | 2 ++ src/render/framegraph/qsetfence.cpp | 2 ++ src/render/framegraph/qsortpolicy.cpp | 2 ++ src/render/framegraph/qsubtreeenabler.cpp | 2 ++ src/render/framegraph/qtechniquefilter.cpp | 2 ++ src/render/framegraph/qviewport.cpp | 2 ++ src/render/framegraph/qwaitfence.cpp | 2 ++ src/render/frontend/qcamera.cpp | 2 ++ src/render/frontend/qcameralens.cpp | 2 ++ src/render/frontend/qcomputecommand.cpp | 2 ++ src/render/frontend/qlayer.cpp | 2 ++ src/render/frontend/qlevelofdetailboundingsphere.cpp | 2 ++ src/render/frontend/qlevelofdetailswitch.cpp | 2 ++ src/render/frontend/qpickingsettings.cpp | 2 ++ src/render/frontend/qrenderaspect.cpp | 2 ++ src/render/frontend/qrendercapabilities.cpp | 2 ++ src/render/frontend/qrenderpluginfactoryif.cpp | 2 ++ src/render/frontend/qrendertarget.cpp | 2 ++ src/render/frontend/qrendertargetoutput.cpp | 2 ++ src/render/geometry/qattribute.cpp | 2 ++ src/render/geometry/qbuffer.cpp | 2 ++ src/render/geometry/qgeometryrenderer.cpp | 2 ++ src/render/geometry/qmesh.cpp | 2 ++ src/render/io/qgeometryloaderfactory.cpp | 2 ++ src/render/io/qsceneexporter.cpp | 2 ++ src/render/io/qsceneexportplugin.cpp | 2 ++ src/render/io/qsceneimporter.cpp | 2 ++ src/render/io/qsceneimportplugin.cpp | 2 ++ src/render/io/qsceneloader.cpp | 2 ++ src/render/lights/qabstractlight.cpp | 2 ++ src/render/lights/qdirectionallight.cpp | 2 ++ src/render/lights/qpointlight.cpp | 2 ++ src/render/lights/qspotlight.cpp | 2 ++ src/render/materialsystem/qeffect.cpp | 2 ++ src/render/materialsystem/qfilterkey.cpp | 2 ++ src/render/materialsystem/qgraphicsapifilter.cpp | 2 ++ src/render/materialsystem/qmaterial.cpp | 2 ++ src/render/materialsystem/qparameter.cpp | 2 ++ src/render/materialsystem/qrenderpass.cpp | 2 ++ src/render/materialsystem/qshaderdata.cpp | 2 ++ src/render/materialsystem/qshaderimage.cpp | 2 ++ src/render/materialsystem/qshaderprogram.cpp | 2 ++ src/render/materialsystem/qshaderprogrambuilder.cpp | 2 ++ src/render/picking/pickeventfilter.cpp | 2 ++ src/render/picking/qabstractraycaster.cpp | 2 ++ src/render/picking/qobjectpicker.cpp | 2 ++ src/render/picking/qpickevent.cpp | 2 ++ src/render/picking/qpicklineevent.cpp | 2 ++ src/render/picking/qpickpointevent.cpp | 2 ++ src/render/picking/qpicktriangleevent.cpp | 2 ++ src/render/picking/qraycaster.cpp | 2 ++ src/render/picking/qraycasterhit.cpp | 2 ++ src/render/picking/qscreenraycaster.cpp | 2 ++ src/render/qrendererplugin.cpp | 2 ++ src/render/raycasting/qabstractcollisionqueryservice.cpp | 2 ++ src/render/renderstates/qalphacoverage.cpp | 2 ++ src/render/renderstates/qalphatest.cpp | 2 ++ src/render/renderstates/qblendequation.cpp | 2 ++ src/render/renderstates/qblendequationarguments.cpp | 2 ++ src/render/renderstates/qclipplane.cpp | 2 ++ src/render/renderstates/qcolormask.cpp | 2 ++ src/render/renderstates/qcullface.cpp | 2 ++ src/render/renderstates/qdepthrange.cpp | 2 ++ src/render/renderstates/qdepthtest.cpp | 2 ++ src/render/renderstates/qdithering.cpp | 2 ++ src/render/renderstates/qfrontface.cpp | 2 ++ src/render/renderstates/qlinewidth.cpp | 2 ++ src/render/renderstates/qmultisampleantialiasing.cpp | 2 ++ src/render/renderstates/qnodepthmask.cpp | 2 ++ src/render/renderstates/qpointsize.cpp | 2 ++ src/render/renderstates/qpolygonoffset.cpp | 2 ++ src/render/renderstates/qrastermode.cpp | 2 ++ src/render/renderstates/qrenderstate.cpp | 2 ++ src/render/renderstates/qscissortest.cpp | 2 ++ src/render/renderstates/qseamlesscubemap.cpp | 2 ++ src/render/renderstates/qstencilmask.cpp | 2 ++ src/render/renderstates/qstenciloperation.cpp | 2 ++ src/render/renderstates/qstenciloperationarguments.cpp | 2 ++ src/render/renderstates/qstenciltest.cpp | 2 ++ src/render/renderstates/qstenciltestarguments.cpp | 2 ++ src/render/shadergraph/qshaderlanguage.cpp | 2 ++ src/render/texture/qabstracttexture.cpp | 2 ++ src/render/texture/qabstracttextureimage.cpp | 2 ++ src/render/texture/qpaintedtextureimage.cpp | 2 ++ src/render/texture/qtexture.cpp | 2 ++ src/render/texture/qtextureimage.cpp | 2 ++ src/render/texture/qtexturewrapmode.cpp | 2 ++ 107 files changed, 214 insertions(+) diff --git a/src/quick3d/quick3drender/items/quick3dbuffer.cpp b/src/quick3d/quick3drender/items/quick3dbuffer.cpp index 32265a578..f63ed9d72 100644 --- a/src/quick3d/quick3drender/items/quick3dbuffer.cpp +++ b/src/quick3d/quick3drender/items/quick3dbuffer.cpp @@ -143,3 +143,5 @@ void Quick3DBuffer::initEngines() } // Qt3DRender QT_END_NAMESPACE + +#include "moc_quick3dbuffer_p.cpp" diff --git a/src/render/backend/offscreensurfacehelper.cpp b/src/render/backend/offscreensurfacehelper.cpp index 6d4927e0c..d740ba742 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 a696cde01..ffc2b6726 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/framegraph/qblitframebuffer.cpp b/src/render/framegraph/qblitframebuffer.cpp index 9e6b09ae9..e1e805169 100644 --- a/src/render/framegraph/qblitframebuffer.cpp +++ b/src/render/framegraph/qblitframebuffer.cpp @@ -456,3 +456,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QBlitFramebuffer::createNodeCreationChange() } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qblitframebuffer.cpp" diff --git a/src/render/framegraph/qbuffercapture.cpp b/src/render/framegraph/qbuffercapture.cpp index cc539433b..2c9981cec 100644 --- a/src/render/framegraph/qbuffercapture.cpp +++ b/src/render/framegraph/qbuffercapture.cpp @@ -83,3 +83,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 9ab870bb2..9314fb382 100644 --- a/src/render/framegraph/qcameraselector.cpp +++ b/src/render/framegraph/qcameraselector.cpp @@ -151,3 +151,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QCameraSelector::createNodeCreationChange() } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qcameraselector.cpp" diff --git a/src/render/framegraph/qclearbuffers.cpp b/src/render/framegraph/qclearbuffers.cpp index 0805c8550..3cb812af2 100644 --- a/src/render/framegraph/qclearbuffers.cpp +++ b/src/render/framegraph/qclearbuffers.cpp @@ -248,3 +248,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QClearBuffers::createNodeCreationChange() co } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qclearbuffers.cpp" diff --git a/src/render/framegraph/qdebugoverlay.cpp b/src/render/framegraph/qdebugoverlay.cpp index e8c513044..9e7fa4545 100644 --- a/src/render/framegraph/qdebugoverlay.cpp +++ b/src/render/framegraph/qdebugoverlay.cpp @@ -65,3 +65,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 1887cba62..ab853fa27 100644 --- a/src/render/framegraph/qdispatchcompute.cpp +++ b/src/render/framegraph/qdispatchcompute.cpp @@ -177,3 +177,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QDispatchCompute::createNodeCreationChange() QT_END_NAMESPACE +#include "moc_qdispatchcompute.cpp" + diff --git a/src/render/framegraph/qframegraphnode.cpp b/src/render/framegraph/qframegraphnode.cpp index bfb1b0f0e..9f7a047f4 100644 --- a/src/render/framegraph/qframegraphnode.cpp +++ b/src/render/framegraph/qframegraphnode.cpp @@ -440,3 +440,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 dd3ba5812..4c762df7a 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 3b2c8f2ba..fb97f6c3e 100644 --- a/src/render/framegraph/qlayerfilter.cpp +++ b/src/render/framegraph/qlayerfilter.cpp @@ -258,3 +258,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QLayerFilter::createNodeCreationChange() con } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qlayerfilter.cpp" diff --git a/src/render/framegraph/qmemorybarrier.cpp b/src/render/framegraph/qmemorybarrier.cpp index 1db4a3e87..ae12f12ac 100644 --- a/src/render/framegraph/qmemorybarrier.cpp +++ b/src/render/framegraph/qmemorybarrier.cpp @@ -168,3 +168,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QMemoryBarrier::createNodeCreationChange() c } // Qt3DRender QT_END_NAMESPACE + +#include "moc_qmemorybarrier.cpp" diff --git a/src/render/framegraph/qnodraw.cpp b/src/render/framegraph/qnodraw.cpp index 00edad6a8..4c19d5295 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 ddc649dd0..67a3da02c 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 742b6aa6c..8808fa3a0 100644 --- a/src/render/framegraph/qproximityfilter.cpp +++ b/src/render/framegraph/qproximityfilter.cpp @@ -194,3 +194,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QProximityFilter::createNodeCreationChange() } // Qt3DRender QT_END_NAMESPACE + +#include "moc_qproximityfilter.cpp" diff --git a/src/render/framegraph/qrendercapture.cpp b/src/render/framegraph/qrendercapture.cpp index a3d72823c..d9be38295 100644 --- a/src/render/framegraph/qrendercapture.cpp +++ b/src/render/framegraph/qrendercapture.cpp @@ -408,3 +408,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QRenderCapture::createNodeCreationChange() c } // Qt3DRender QT_END_NAMESPACE + +#include "moc_qrendercapture.cpp" diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp index 74d0eed7e..edc8b0b16 100644 --- a/src/render/framegraph/qrenderpassfilter.cpp +++ b/src/render/framegraph/qrenderpassfilter.cpp @@ -222,3 +222,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QRenderPassFilter::createNodeCreationChange( } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qrenderpassfilter.cpp" diff --git a/src/render/framegraph/qrenderstateset.cpp b/src/render/framegraph/qrenderstateset.cpp index c8cc03423..c3a465d79 100644 --- a/src/render/framegraph/qrenderstateset.cpp +++ b/src/render/framegraph/qrenderstateset.cpp @@ -231,3 +231,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QRenderStateSet::createNodeCreationChange() } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qrenderstateset.cpp" diff --git a/src/render/framegraph/qrendersurfaceselector.cpp b/src/render/framegraph/qrendersurfaceselector.cpp index c374e993c..66086444f 100644 --- a/src/render/framegraph/qrendersurfaceselector.cpp +++ b/src/render/framegraph/qrendersurfaceselector.cpp @@ -329,3 +329,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QRenderSurfaceSelector::createNodeCreationCh } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qrendersurfaceselector.cpp" diff --git a/src/render/framegraph/qrendertargetselector.cpp b/src/render/framegraph/qrendertargetselector.cpp index c16d1c60f..50e8e455d 100644 --- a/src/render/framegraph/qrendertargetselector.cpp +++ b/src/render/framegraph/qrendertargetselector.cpp @@ -184,3 +184,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QRenderTargetSelector::createNodeCreationCha } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qrendertargetselector.cpp" diff --git a/src/render/framegraph/qsetfence.cpp b/src/render/framegraph/qsetfence.cpp index bb7e139bd..5a2602693 100644 --- a/src/render/framegraph/qsetfence.cpp +++ b/src/render/framegraph/qsetfence.cpp @@ -173,3 +173,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QSetFence::createNodeCreationChange() const } // Qt3DRender QT_END_NAMESPACE + +#include "moc_qsetfence.cpp" diff --git a/src/render/framegraph/qsortpolicy.cpp b/src/render/framegraph/qsortpolicy.cpp index bed47b76c..3478e3598 100644 --- a/src/render/framegraph/qsortpolicy.cpp +++ b/src/render/framegraph/qsortpolicy.cpp @@ -201,3 +201,5 @@ void QSortPolicy::setSortTypes(const QVector &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 06f414b56..63fea396e 100644 --- a/src/render/framegraph/qsubtreeenabler.cpp +++ b/src/render/framegraph/qsubtreeenabler.cpp @@ -183,3 +183,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QSubtreeEnabler::createNodeCreationChange() } //Qt3DRender QT_END_NAMESPACE + +#include "moc_qsubtreeenabler.cpp" diff --git a/src/render/framegraph/qtechniquefilter.cpp b/src/render/framegraph/qtechniquefilter.cpp index 42595c713..0d1a83170 100644 --- a/src/render/framegraph/qtechniquefilter.cpp +++ b/src/render/framegraph/qtechniquefilter.cpp @@ -224,3 +224,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QTechniqueFilter::createNodeCreationChange() } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qtechniquefilter.cpp" diff --git a/src/render/framegraph/qviewport.cpp b/src/render/framegraph/qviewport.cpp index cf1b89aab..706197f0c 100644 --- a/src/render/framegraph/qviewport.cpp +++ b/src/render/framegraph/qviewport.cpp @@ -168,3 +168,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QViewport::createNodeCreationChange() const } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qviewport.cpp" diff --git a/src/render/framegraph/qwaitfence.cpp b/src/render/framegraph/qwaitfence.cpp index 12571994b..581c44948 100644 --- a/src/render/framegraph/qwaitfence.cpp +++ b/src/render/framegraph/qwaitfence.cpp @@ -217,3 +217,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QWaitFence::createNodeCreationChange() const } // Qt3DRender QT_END_NAMESPACE + +#include "moc_qwaitfence.cpp" diff --git a/src/render/frontend/qcamera.cpp b/src/render/frontend/qcamera.cpp index f107cc09a..0c0d2d5fe 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 ff481c483..bb3f31dae 100644 --- a/src/render/frontend/qcameralens.cpp +++ b/src/render/frontend/qcameralens.cpp @@ -634,3 +634,5 @@ void QCameraLens::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) } // Qt3DRender QT_END_NAMESPACE + +#include "moc_qcameralens.cpp" diff --git a/src/render/frontend/qcomputecommand.cpp b/src/render/frontend/qcomputecommand.cpp index aeecab6e5..d53eb741f 100644 --- a/src/render/frontend/qcomputecommand.cpp +++ b/src/render/frontend/qcomputecommand.cpp @@ -292,3 +292,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QComputeCommand::createNodeCreationChange() } // Render QT_END_NAMESPACE + +#include "moc_qcomputecommand.cpp" diff --git a/src/render/frontend/qlayer.cpp b/src/render/frontend/qlayer.cpp index 0859becfc..e6ad47a55 100644 --- a/src/render/frontend/qlayer.cpp +++ b/src/render/frontend/qlayer.cpp @@ -199,3 +199,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QLayer::createNodeCreationChange() const } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qlayer.cpp" diff --git a/src/render/frontend/qlevelofdetailboundingsphere.cpp b/src/render/frontend/qlevelofdetailboundingsphere.cpp index c21b1102d..3ebdc00ce 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 976e244a7..007792878 100644 --- a/src/render/frontend/qlevelofdetailswitch.cpp +++ b/src/render/frontend/qlevelofdetailswitch.cpp @@ -141,3 +141,5 @@ void QLevelOfDetailSwitch::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qlevelofdetailswitch.cpp" diff --git a/src/render/frontend/qpickingsettings.cpp b/src/render/frontend/qpickingsettings.cpp index 01351dcfd..857cef86e 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 5ff499ec5..b02aac16e 100644 --- a/src/render/frontend/qrenderaspect.cpp +++ b/src/render/frontend/qrenderaspect.cpp @@ -1002,3 +1002,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 ad557d72f..b10dfaabe 100644 --- a/src/render/frontend/qrendercapabilities.cpp +++ b/src/render/frontend/qrendercapabilities.cpp @@ -875,3 +875,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 eac983cf1..eba969e59 100644 --- a/src/render/frontend/qrenderpluginfactoryif.cpp +++ b/src/render/frontend/qrenderpluginfactoryif.cpp @@ -63,3 +63,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 a019a11ca..a6072b327 100644 --- a/src/render/frontend/qrendertarget.cpp +++ b/src/render/frontend/qrendertarget.cpp @@ -161,3 +161,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QRenderTarget::createNodeCreationChange() co } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qrendertarget.cpp" diff --git a/src/render/frontend/qrendertargetoutput.cpp b/src/render/frontend/qrendertargetoutput.cpp index 83f4d1a82..1181eca4e 100644 --- a/src/render/frontend/qrendertargetoutput.cpp +++ b/src/render/frontend/qrendertargetoutput.cpp @@ -316,3 +316,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QRenderTargetOutput::createNodeCreationChang } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qrendertargetoutput.cpp" diff --git a/src/render/geometry/qattribute.cpp b/src/render/geometry/qattribute.cpp index cbc844e0b..d9dfa1e6c 100644 --- a/src/render/geometry/qattribute.cpp +++ b/src/render/geometry/qattribute.cpp @@ -519,3 +519,5 @@ The signal is emitted with \a vertexBaseType when the dataType changed. } // Qt3DRender QT_END_NAMESPACE + +#include "moc_qattribute.cpp" \ No newline at end of file diff --git a/src/render/geometry/qbuffer.cpp b/src/render/geometry/qbuffer.cpp index 6c5e0fbbd..3d90e8fb9 100644 --- a/src/render/geometry/qbuffer.cpp +++ b/src/render/geometry/qbuffer.cpp @@ -493,3 +493,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QBuffer::createNodeCreationChange() const } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qbuffer.cpp" diff --git a/src/render/geometry/qgeometryrenderer.cpp b/src/render/geometry/qgeometryrenderer.cpp index 5a37fa4dd..cca10db3b 100644 --- a/src/render/geometry/qgeometryrenderer.cpp +++ b/src/render/geometry/qgeometryrenderer.cpp @@ -530,3 +530,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QGeometryRenderer::createNodeCreationChange( } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qgeometryrenderer.cpp" diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp index a8950cca8..98c5073aa 100644 --- a/src/render/geometry/qmesh.cpp +++ b/src/render/geometry/qmesh.cpp @@ -445,3 +445,5 @@ void MeshDownloadRequest::onCompleted() } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qmesh.cpp" diff --git a/src/render/io/qgeometryloaderfactory.cpp b/src/render/io/qgeometryloaderfactory.cpp index a64951134..941d59476 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 247a5f27d..b96566e4f 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 9bd5db921..5ee0f787c 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 42cb8bca5..93a405b78 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 6010ce126..89f9e0119 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 58ed6f713..c067ba1f8 100644 --- a/src/render/io/qsceneloader.cpp +++ b/src/render/io/qsceneloader.cpp @@ -393,3 +393,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QSceneLoader::createNodeCreationChange() con } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qsceneloader.cpp" diff --git a/src/render/lights/qabstractlight.cpp b/src/render/lights/qabstractlight.cpp index ecdcf292d..d8a907122 100644 --- a/src/render/lights/qabstractlight.cpp +++ b/src/render/lights/qabstractlight.cpp @@ -183,3 +183,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 f7c1ebc95..c558baa46 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 37c157502..91be1bc6e 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 8ff10f2d4..eb18c323c 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/qeffect.cpp b/src/render/materialsystem/qeffect.cpp index fd070bffa..8ec56f42d 100644 --- a/src/render/materialsystem/qeffect.cpp +++ b/src/render/materialsystem/qeffect.cpp @@ -280,3 +280,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QEffect::createNodeCreationChange() 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 d900062bf..c145993e7 100644 --- a/src/render/materialsystem/qfilterkey.cpp +++ b/src/render/materialsystem/qfilterkey.cpp @@ -155,3 +155,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QFilterKey::createNodeCreationChange() 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 fcfeb88b3..47dbfc73d 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 91bd9a1e2..2ce4c8fef 100644 --- a/src/render/materialsystem/qmaterial.cpp +++ b/src/render/materialsystem/qmaterial.cpp @@ -313,3 +313,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QMaterial::createNodeCreationChange() 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 cb2dd2694..6686e2aca 100644 --- a/src/render/materialsystem/qparameter.cpp +++ b/src/render/materialsystem/qparameter.cpp @@ -329,3 +329,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QParameter::createNodeCreationChange() 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 ad8dae2de..32a2270ba 100644 --- a/src/render/materialsystem/qrenderpass.cpp +++ b/src/render/materialsystem/qrenderpass.cpp @@ -413,3 +413,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QRenderPass::createNodeCreationChange() cons } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qrenderpass.cpp" diff --git a/src/render/materialsystem/qshaderdata.cpp b/src/render/materialsystem/qshaderdata.cpp index 9113d9f89..91aa668d6 100644 --- a/src/render/materialsystem/qshaderdata.cpp +++ b/src/render/materialsystem/qshaderdata.cpp @@ -166,3 +166,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QShaderData::createNodeCreationChange() cons } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qshaderdata.cpp" diff --git a/src/render/materialsystem/qshaderimage.cpp b/src/render/materialsystem/qshaderimage.cpp index 15a58df9c..325f8a4c6 100644 --- a/src/render/materialsystem/qshaderimage.cpp +++ b/src/render/materialsystem/qshaderimage.cpp @@ -989,3 +989,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr Qt3DRender::QShaderImage::createNodeCreation } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qshaderimage.cpp" diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp index 534c26713..d2aeeaaa6 100644 --- a/src/render/materialsystem/qshaderprogram.cpp +++ b/src/render/materialsystem/qshaderprogram.cpp @@ -747,3 +747,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QShaderProgram::createNodeCreationChange() c } // 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 3d7d30671..adbb97840 100644 --- a/src/render/materialsystem/qshaderprogrambuilder.cpp +++ b/src/render/materialsystem/qshaderprogrambuilder.cpp @@ -516,3 +516,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QShaderProgramBuilder::createNodeCreationCha } // 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 9e46510b8..c33129494 100644 --- a/src/render/picking/pickeventfilter.cpp +++ b/src/render/picking/pickeventfilter.cpp @@ -115,3 +115,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 6632c4aed..df3d7f8a2 100644 --- a/src/render/picking/qabstractraycaster.cpp +++ b/src/render/picking/qabstractraycaster.cpp @@ -400,3 +400,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QAbstractRayCaster::createNodeCreationChange } // Qt3DRender QT_END_NAMESPACE + +#include "moc_qabstractraycaster.cpp" diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp index 106e70d4c..c5d2169f5 100644 --- a/src/render/picking/qobjectpicker.cpp +++ b/src/render/picking/qobjectpicker.cpp @@ -492,3 +492,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QObjectPicker::createNodeCreationChange() co } // Qt3DRender QT_END_NAMESPACE + +#include "moc_qobjectpicker.cpp" diff --git a/src/render/picking/qpickevent.cpp b/src/render/picking/qpickevent.cpp index fa9d56726..98649cb96 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 37f972aba..4b27e54d9 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 a724e4bfe..805419208 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 59bf8c162..f2003beaf 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 b9a378df8..187d2bf29 100644 --- a/src/render/picking/qraycaster.cpp +++ b/src/render/picking/qraycaster.cpp @@ -206,3 +206,5 @@ void QRayCaster::trigger(const QVector3D &origin, const QVector3D &direction, fl } // Qt3DRender QT_END_NAMESPACE + +#include "moc_qraycaster.cpp" diff --git a/src/render/picking/qraycasterhit.cpp b/src/render/picking/qraycasterhit.cpp index a12569970..534d7928e 100644 --- a/src/render/picking/qraycasterhit.cpp +++ b/src/render/picking/qraycasterhit.cpp @@ -231,3 +231,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 bce483e11..6cd43bf18 100644 --- a/src/render/picking/qscreenraycaster.cpp +++ b/src/render/picking/qscreenraycaster.cpp @@ -143,3 +143,5 @@ void QScreenRayCaster::trigger(const QPoint &position) } // Qt3DRender QT_END_NAMESPACE + +#include "moc_qscreenraycaster.cpp" diff --git a/src/render/qrendererplugin.cpp b/src/render/qrendererplugin.cpp index bc6a9d210..3634f36b0 100644 --- a/src/render/qrendererplugin.cpp +++ b/src/render/qrendererplugin.cpp @@ -66,3 +66,5 @@ AbstractRenderer *QRendererPlugin::create(const QString &key, QRenderAspect::Ren } // Qt3DRender QT_END_NAMESPACE + +#include "moc_qrendererplugin_p.cpp" diff --git a/src/render/raycasting/qabstractcollisionqueryservice.cpp b/src/render/raycasting/qabstractcollisionqueryservice.cpp index 75bc99405..931b1214a 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 d94fe6fe8..391c57430 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 43d3ee1b8..2fdb469b7 100644 --- a/src/render/renderstates/qalphatest.cpp +++ b/src/render/renderstates/qalphatest.cpp @@ -173,3 +173,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QAlphaTest::createNodeCreationChange() const } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qalphatest.cpp" diff --git a/src/render/renderstates/qblendequation.cpp b/src/render/renderstates/qblendequation.cpp index 36f41f287..2a08b67ef 100644 --- a/src/render/renderstates/qblendequation.cpp +++ b/src/render/renderstates/qblendequation.cpp @@ -133,3 +133,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QBlendEquation::createNodeCreationChange() c } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qblendequation.cpp" diff --git a/src/render/renderstates/qblendequationarguments.cpp b/src/render/renderstates/qblendequationarguments.cpp index cc9cde1b5..33e8ffce8 100644 --- a/src/render/renderstates/qblendequationarguments.cpp +++ b/src/render/renderstates/qblendequationarguments.cpp @@ -307,3 +307,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QBlendEquationArguments::createNodeCreationC } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qblendequationarguments.cpp" diff --git a/src/render/renderstates/qclipplane.cpp b/src/render/renderstates/qclipplane.cpp index 814a199ba..dc110fd22 100644 --- a/src/render/renderstates/qclipplane.cpp +++ b/src/render/renderstates/qclipplane.cpp @@ -178,3 +178,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QClipPlane::createNodeCreationChange() const } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qclipplane.cpp" diff --git a/src/render/renderstates/qcolormask.cpp b/src/render/renderstates/qcolormask.cpp index 239264b77..4900122b6 100644 --- a/src/render/renderstates/qcolormask.cpp +++ b/src/render/renderstates/qcolormask.cpp @@ -199,3 +199,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QColorMask::createNodeCreationChange() const QT_END_NAMESPACE +#include "moc_qcolormask.cpp" + diff --git a/src/render/renderstates/qcullface.cpp b/src/render/renderstates/qcullface.cpp index 03caef961..fb05d4ce0 100644 --- a/src/render/renderstates/qcullface.cpp +++ b/src/render/renderstates/qcullface.cpp @@ -202,3 +202,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QCullFace::createNodeCreationChange() const } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qcullface.cpp" diff --git a/src/render/renderstates/qdepthrange.cpp b/src/render/renderstates/qdepthrange.cpp index 465349e1e..a4f9a24dd 100644 --- a/src/render/renderstates/qdepthrange.cpp +++ b/src/render/renderstates/qdepthrange.cpp @@ -154,3 +154,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QDepthRange::createNodeCreationChange() cons } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qdepthrange.cpp" diff --git a/src/render/renderstates/qdepthtest.cpp b/src/render/renderstates/qdepthtest.cpp index c0c17591b..2f4e6a90f 100644 --- a/src/render/renderstates/qdepthtest.cpp +++ b/src/render/renderstates/qdepthtest.cpp @@ -158,3 +158,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QDepthTest::createNodeCreationChange() const } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qdepthtest.cpp" diff --git a/src/render/renderstates/qdithering.cpp b/src/render/renderstates/qdithering.cpp index b74dee087..8cc1dd964 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 c95a433fc..8b39d4f36 100644 --- a/src/render/renderstates/qfrontface.cpp +++ b/src/render/renderstates/qfrontface.cpp @@ -131,3 +131,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QFrontFace::createNodeCreationChange() const } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qfrontface.cpp" diff --git a/src/render/renderstates/qlinewidth.cpp b/src/render/renderstates/qlinewidth.cpp index 7b6d6e798..01c7f6f81 100644 --- a/src/render/renderstates/qlinewidth.cpp +++ b/src/render/renderstates/qlinewidth.cpp @@ -123,3 +123,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QLineWidth::createNodeCreationChange() const } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qlinewidth.cpp" diff --git a/src/render/renderstates/qmultisampleantialiasing.cpp b/src/render/renderstates/qmultisampleantialiasing.cpp index b9acfef11..26894bce3 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 1c4a13200..6b0a56fb1 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 a0fdec809..29e9fc70f 100644 --- a/src/render/renderstates/qpointsize.cpp +++ b/src/render/renderstates/qpointsize.cpp @@ -151,3 +151,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QPointSize::createNodeCreationChange() const QT_END_NAMESPACE +#include "moc_qpointsize.cpp" + diff --git a/src/render/renderstates/qpolygonoffset.cpp b/src/render/renderstates/qpolygonoffset.cpp index 9cd1956aa..d4df47ed7 100644 --- a/src/render/renderstates/qpolygonoffset.cpp +++ b/src/render/renderstates/qpolygonoffset.cpp @@ -152,3 +152,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QPolygonOffset::createNodeCreationChange() c } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qpolygonoffset.cpp" diff --git a/src/render/renderstates/qrastermode.cpp b/src/render/renderstates/qrastermode.cpp index cb220858c..df38fe9e2 100644 --- a/src/render/renderstates/qrastermode.cpp +++ b/src/render/renderstates/qrastermode.cpp @@ -193,3 +193,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QRasterMode::createNodeCreationChange() cons } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qrastermode.cpp" diff --git a/src/render/renderstates/qrenderstate.cpp b/src/render/renderstates/qrenderstate.cpp index 4b710a49d..3e74a7e7c 100644 --- a/src/render/renderstates/qrenderstate.cpp +++ b/src/render/renderstates/qrenderstate.cpp @@ -114,3 +114,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QRenderState::createNodeCreationChange() con } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qrenderstate.cpp" diff --git a/src/render/renderstates/qscissortest.cpp b/src/render/renderstates/qscissortest.cpp index ba7c50536..1eb22f8c8 100644 --- a/src/render/renderstates/qscissortest.cpp +++ b/src/render/renderstates/qscissortest.cpp @@ -203,3 +203,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QScissorTest::createNodeCreationChange() con } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qscissortest.cpp" diff --git a/src/render/renderstates/qseamlesscubemap.cpp b/src/render/renderstates/qseamlesscubemap.cpp index 4a98cba77..66afb1350 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 8f0ab5367..d2055b7b3 100644 --- a/src/render/renderstates/qstencilmask.cpp +++ b/src/render/renderstates/qstencilmask.cpp @@ -155,3 +155,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QStencilMask::createNodeCreationChange() con } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qstencilmask.cpp" diff --git a/src/render/renderstates/qstenciloperation.cpp b/src/render/renderstates/qstenciloperation.cpp index cf628bd7c..9cf6d20f8 100644 --- a/src/render/renderstates/qstenciloperation.cpp +++ b/src/render/renderstates/qstenciloperation.cpp @@ -158,3 +158,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QStencilOperation::createNodeCreationChange( } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qstenciloperation.cpp" diff --git a/src/render/renderstates/qstenciloperationarguments.cpp b/src/render/renderstates/qstenciloperationarguments.cpp index f79fa7caa..a4ef7e286 100644 --- a/src/render/renderstates/qstenciloperationarguments.cpp +++ b/src/render/renderstates/qstenciloperationarguments.cpp @@ -227,3 +227,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 5467d4af6..61de8c5df 100644 --- a/src/render/renderstates/qstenciltest.cpp +++ b/src/render/renderstates/qstenciltest.cpp @@ -161,3 +161,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QStencilTest::createNodeCreationChange() con } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qstenciltest.cpp" diff --git a/src/render/renderstates/qstenciltestarguments.cpp b/src/render/renderstates/qstenciltestarguments.cpp index a82dcc94b..db46245cb 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 9c0b6f640..eb89245e7 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 1817d81c3..9398fdf56 100644 --- a/src/render/texture/qabstracttexture.cpp +++ b/src/render/texture/qabstracttexture.cpp @@ -1191,3 +1191,5 @@ void QAbstractTexture::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qabstracttexture.cpp" diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp index 8058dfaa6..a836636d4 100644 --- a/src/render/texture/qabstracttextureimage.cpp +++ b/src/render/texture/qabstracttextureimage.cpp @@ -284,3 +284,5 @@ Qt3DCore::QNodeCreatedChangeBasePtr QAbstractTextureImage::createNodeCreationCha } // namespace Qt3DRender QT_END_NAMESPACE + +#include "moc_qabstracttextureimage.cpp" diff --git a/src/render/texture/qpaintedtextureimage.cpp b/src/render/texture/qpaintedtextureimage.cpp index a286a5cdd..c03588886 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 bfd7b4346..906815b8e 100644 --- a/src/render/texture/qtexture.cpp +++ b/src/render/texture/qtexture.cpp @@ -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 1ca49e740..d164ec8cf 100644 --- a/src/render/texture/qtextureimage.cpp +++ b/src/render/texture/qtextureimage.cpp @@ -332,3 +332,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 30980835a..92f2679b3 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" -- cgit v1.2.3 From 451f9743658f1b89c508b9018ab1b4927dda4e87 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 16:00:46 +0100 Subject: Qt3D Tests: includemocs Task-number: QTBUG-103286 Change-Id: I8e97b8d7f997fa42a791d0daebe5987e99c97b30 Reviewed-by: Sean Harmer (cherry picked from commit feed7cf15a3fe7c2a68525d214d2f00d9d4017a9) Reviewed-by: Paul Lemire --- tests/auto/core/common/qbackendnodetester.cpp | 2 ++ tests/auto/input/commons/commons.pri | 2 ++ tests/auto/input/commons/testdevice.cpp | 31 ++++++++++++++++++++++ .../tst_quick3dnodeinstantiator.cpp | 1 + .../auto/render/qmlscenereader/qmlscenereader.cpp | 2 ++ tests/auto/render/qmlscenereader/qmlscenereader.h | 5 ++++ tests/auto/shared/util.cpp | 2 ++ 7 files changed, 45 insertions(+) create mode 100644 tests/auto/input/commons/testdevice.cpp diff --git a/tests/auto/core/common/qbackendnodetester.cpp b/tests/auto/core/common/qbackendnodetester.cpp index 13f4683d9..0bec5e5dd 100644 --- a/tests/auto/core/common/qbackendnodetester.cpp +++ b/tests/auto/core/common/qbackendnodetester.cpp @@ -84,3 +84,5 @@ QNodeCreatedChangeBasePtr QBackendNodeTester::creationChange(QNode *frontend) co } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qbackendnodetester.cpp" diff --git a/tests/auto/input/commons/commons.pri b/tests/auto/input/commons/commons.pri index 4913f5bbb..656f41980 100644 --- a/tests/auto/input/commons/commons.pri +++ b/tests/auto/input/commons/commons.pri @@ -1,6 +1,8 @@ HEADERS += $$PWD/testdevice.h \ $$PWD/testdeviceproxy.h +SOURCES += $$PWD/testdevice.cpp + INCLUDEPATH += $$PWD include(../../core/common/common.pri) diff --git a/tests/auto/input/commons/testdevice.cpp b/tests/auto/input/commons/testdevice.cpp new file mode 100644 index 000000000..91a2ad159 --- /dev/null +++ b/tests/auto/input/commons/testdevice.cpp @@ -0,0 +1,31 @@ +/**************************************************************************** +** +** 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/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp b/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp index d4d0d56e2..501b3d9bf 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp +++ b/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp @@ -254,3 +254,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 QT_BEGIN_NAMESPACE @@ -61,3 +64,5 @@ private: }; QT_END_NAMESPACE + +#endif 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" -- cgit v1.2.3 From 9afdc37a067e6a6ed2f536d012c439cd385b7fac Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:33 +0100 Subject: Qt3DExtras: includemocs Task-number: QTBUG-103286 Change-Id: I07cce1da294d45a03bc1d0b9ef18629bba3a48e0 Reviewed-by: Sean Harmer (cherry picked from commit 400689d358f9c8dc05e556b04ff928ad32930c81) Reviewed-by: Paul Lemire --- src/extras/3dtext/qextrudedtextgeometry.cpp | 2 ++ src/extras/3dtext/qextrudedtextmesh.cpp | 2 ++ src/extras/defaults/qabstractspritesheet.cpp | 2 ++ src/extras/defaults/qdiffusemapmaterial.cpp | 2 ++ src/extras/defaults/qdiffusespecularmapmaterial.cpp | 2 ++ src/extras/defaults/qdiffusespecularmaterial.cpp | 2 ++ src/extras/defaults/qforwardrenderer.cpp | 2 ++ src/extras/defaults/qgoochmaterial.cpp | 2 ++ src/extras/defaults/qmetalroughmaterial.cpp | 2 ++ src/extras/defaults/qmorphphongmaterial.cpp | 2 ++ src/extras/defaults/qnormaldiffusemapalphamaterial.cpp | 2 ++ src/extras/defaults/qnormaldiffusemapmaterial.cpp | 2 ++ src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp | 2 ++ src/extras/defaults/qpervertexcolormaterial.cpp | 2 ++ src/extras/defaults/qphongalphamaterial.cpp | 2 ++ src/extras/defaults/qphongmaterial.cpp | 2 ++ src/extras/defaults/qskyboxentity.cpp | 2 ++ src/extras/defaults/qspritegrid.cpp | 2 ++ src/extras/defaults/qspritesheet.cpp | 2 ++ src/extras/defaults/qspritesheetitem.cpp | 2 ++ src/extras/defaults/qt3dwindow.cpp | 2 ++ src/extras/defaults/qtexturematerial.cpp | 2 ++ src/extras/geometries/qconegeometry.cpp | 2 ++ src/extras/geometries/qconemesh.cpp | 2 ++ src/extras/geometries/qcuboidgeometry.cpp | 2 ++ src/extras/geometries/qcuboidmesh.cpp | 2 ++ src/extras/geometries/qcylindergeometry.cpp | 2 ++ src/extras/geometries/qcylindermesh.cpp | 2 ++ src/extras/geometries/qplanegeometry.cpp | 2 ++ src/extras/geometries/qplanemesh.cpp | 2 ++ src/extras/geometries/qspheregeometry.cpp | 2 ++ src/extras/geometries/qspheremesh.cpp | 2 ++ src/extras/geometries/qtorusgeometry.cpp | 2 ++ src/extras/geometries/qtorusmesh.cpp | 2 ++ src/extras/text/distancefieldtextrenderer.cpp | 2 ++ src/extras/text/qtext2dentity.cpp | 2 ++ src/extras/text/qtext2dmaterial.cpp | 2 ++ src/extras/text/qtextureatlas.cpp | 2 ++ 38 files changed, 76 insertions(+) diff --git a/src/extras/3dtext/qextrudedtextgeometry.cpp b/src/extras/3dtext/qextrudedtextgeometry.cpp index b2612755c..1fc1c580f 100644 --- a/src/extras/3dtext/qextrudedtextgeometry.cpp +++ b/src/extras/3dtext/qextrudedtextgeometry.cpp @@ -514,3 +514,5 @@ Qt3DRender::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/qabstractspritesheet.cpp b/src/extras/defaults/qabstractspritesheet.cpp index 87a10e37a..c889668ba 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 22552c3cd..c7779ec03 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 f4b5fc25a..1a056b68c 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 13a37399a..8c9e03359 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 39789802d..7d1ac836c 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 ba8faaf42..f63fb2493 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 631abb9c8..9b3d10a20 100644 --- a/src/extras/defaults/qmetalroughmaterial.cpp +++ b/src/extras/defaults/qmetalroughmaterial.cpp @@ -481,3 +481,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 0a722168d..3748289a3 100644 --- a/src/extras/defaults/qmorphphongmaterial.cpp +++ b/src/extras/defaults/qmorphphongmaterial.cpp @@ -330,3 +330,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 640a04596..c69b5ce8f 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 106b5643c..30f206b87 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 5a112f6e8..52cba143b 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 a2a42156f..d6576ec80 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 9e9ec293b..c236d4ff0 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 a9400adf8..e6c424e3a 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 712d7fe9c..b09ea8c3e 100644 --- a/src/extras/defaults/qskyboxentity.cpp +++ b/src/extras/defaults/qskyboxentity.cpp @@ -383,3 +383,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 00a5aef7e..a5b888d45 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 8e915cb97..3f4b15a5f 100644 --- a/src/extras/defaults/qspritesheet.cpp +++ b/src/extras/defaults/qspritesheet.cpp @@ -171,3 +171,5 @@ void QSpriteSheet::setSprites(QVector 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 2d29429a1..78f842367 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 18ee6a730..aab919f0f 100644 --- a/src/extras/defaults/qt3dwindow.cpp +++ b/src/extras/defaults/qt3dwindow.cpp @@ -319,3 +319,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 1349938b7..19be1e383 100644 --- a/src/extras/defaults/qtexturematerial.cpp +++ b/src/extras/defaults/qtexturematerial.cpp @@ -285,3 +285,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 fa10a5f3e..689dc70db 100644 --- a/src/extras/geometries/qconegeometry.cpp +++ b/src/extras/geometries/qconegeometry.cpp @@ -755,3 +755,5 @@ QAttribute *QConeGeometry::indexAttribute() const } // namespace Qt3DExtras QT_END_NAMESPACE + +#include "moc_qconegeometry.cpp" diff --git a/src/extras/geometries/qconemesh.cpp b/src/extras/geometries/qconemesh.cpp index d38fe04cf..05df9514a 100644 --- a/src/extras/geometries/qconemesh.cpp +++ b/src/extras/geometries/qconemesh.cpp @@ -243,3 +243,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 b64cb0568..48e1add8f 100644 --- a/src/extras/geometries/qcuboidgeometry.cpp +++ b/src/extras/geometries/qcuboidgeometry.cpp @@ -916,3 +916,5 @@ QAttribute *QCuboidGeometry::indexAttribute() const } // Qt3DExtras QT_END_NAMESPACE + +#include "moc_qcuboidgeometry.cpp" diff --git a/src/extras/geometries/qcuboidmesh.cpp b/src/extras/geometries/qcuboidmesh.cpp index fdc811af2..cf4128b3c 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 602661810..fe0dfe3b8 100644 --- a/src/extras/geometries/qcylindergeometry.cpp +++ b/src/extras/geometries/qcylindergeometry.cpp @@ -607,3 +607,5 @@ QAttribute *QCylinderGeometry::indexAttribute() const } // namespace Qt3DExtras QT_END_NAMESPACE + +#include "moc_qcylindergeometry.cpp" diff --git a/src/extras/geometries/qcylindermesh.cpp b/src/extras/geometries/qcylindermesh.cpp index 25e6b0374..20ceea1ac 100644 --- a/src/extras/geometries/qcylindermesh.cpp +++ b/src/extras/geometries/qcylindermesh.cpp @@ -183,3 +183,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 562409d83..02f4cde90 100644 --- a/src/extras/geometries/qplanegeometry.cpp +++ b/src/extras/geometries/qplanegeometry.cpp @@ -573,3 +573,5 @@ void QPlaneGeometryPrivate::init() } // Qt3DExtras QT_END_NAMESPACE + +#include "moc_qplanegeometry.cpp" diff --git a/src/extras/geometries/qplanemesh.cpp b/src/extras/geometries/qplanemesh.cpp index 57cacf914..e8b3a1b56 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 77de3163b..028541191 100644 --- a/src/extras/geometries/qspheregeometry.cpp +++ b/src/extras/geometries/qspheregeometry.cpp @@ -596,3 +596,5 @@ QAttribute *QSphereGeometry::indexAttribute() const QT_END_NAMESPACE +#include "moc_qspheregeometry.cpp" + diff --git a/src/extras/geometries/qspheremesh.cpp b/src/extras/geometries/qspheremesh.cpp index 8a055ebac..a07495d6a 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 bca7aa63c..0545b9f14 100644 --- a/src/extras/geometries/qtorusgeometry.cpp +++ b/src/extras/geometries/qtorusgeometry.cpp @@ -558,3 +558,5 @@ QAttribute *QTorusGeometry::indexAttribute() const } // Qt3DExtras QT_END_NAMESPACE + +#include "moc_qtorusgeometry.cpp" diff --git a/src/extras/geometries/qtorusmesh.cpp b/src/extras/geometries/qtorusmesh.cpp index c45f8970f..5309abb1a 100644 --- a/src/extras/geometries/qtorusmesh.cpp +++ b/src/extras/geometries/qtorusmesh.cpp @@ -175,3 +175,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 276ebee39..81878706a 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 13ecce3c9..59e8284e1 100644 --- a/src/extras/text/qtext2dentity.cpp +++ b/src/extras/text/qtext2dentity.cpp @@ -485,3 +485,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 cc19421b2..e646ec580 100644 --- a/src/extras/text/qtext2dmaterial.cpp +++ b/src/extras/text/qtext2dmaterial.cpp @@ -177,3 +177,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 afb9c7525..40a285727 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" -- cgit v1.2.3 From 398dee23fb9ed6a18bf68a5905614b0c7245bbf9 Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 14:26:36 +0100 Subject: Fix compile warnings Task-number: QTBUG-103286 Change-Id: Ie97b6e5375338007ebba4d1a6ae235f068453fb5 Reviewed-by: Sean Harmer (cherry picked from commit 2624bc4e7ade11cdb210b2bb27fb0ffd971036a7) Reviewed-by: Paul Lemire --- src/logic/qlogicaspect.cpp | 1 - src/logic/qlogicaspect_p.h | 1 - 2 files changed, 2 deletions(-) diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp index 81e8fb67e..95eff09c2 100644 --- a/src/logic/qlogicaspect.cpp +++ b/src/logic/qlogicaspect.cpp @@ -70,7 +70,6 @@ namespace Qt3DLogic { QLogicAspectPrivate::QLogicAspectPrivate() : QAbstractAspectPrivate() , m_time(0) - , m_initialized(false) , m_manager(new Logic::Manager) , m_executor(new Logic::Executor) , m_callbackJob(new Logic::CallbackJob) diff --git a/src/logic/qlogicaspect_p.h b/src/logic/qlogicaspect_p.h index ff424f427..33493f964 100644 --- a/src/logic/qlogicaspect_p.h +++ b/src/logic/qlogicaspect_p.h @@ -75,7 +75,6 @@ class QLogicAspectPrivate : public Qt3DCore::QAbstractAspectPrivate void registerBackendTypes(); qint64 m_time; - bool m_initialized; QScopedPointer m_manager; QScopedPointer m_executor; QSharedPointer m_callbackJob; -- cgit v1.2.3 From b84152e3132f55824c33feaf69bb31288fd5aa4b Mon Sep 17 00:00:00 2001 From: Mike Krus Date: Tue, 21 Jun 2022 10:59:31 +0100 Subject: Qt3DQuick: includemocs Task-number: QTBUG-103286 Change-Id: I877209c04cd1060b635c7a076069bb0c04de9fa9 Reviewed-by: Sean Harmer (cherry picked from commit b4c112f0a7319902438e3b4128bafef144b0a0f3) Reviewed-by: Paul Lemire --- src/quick3d/quick3d/items/quick3dentity.cpp | 2 ++ src/quick3d/quick3d/items/quick3djoint.cpp | 2 ++ src/quick3d/quick3d/items/quick3dnode.cpp | 2 ++ src/quick3d/quick3d/qquaternionanimation.cpp | 2 ++ src/quick3d/quick3d/qt3dquickvaluetypes.cpp | 2 ++ 5 files changed, 10 insertions(+) diff --git a/src/quick3d/quick3d/items/quick3dentity.cpp b/src/quick3d/quick3d/items/quick3dentity.cpp index e29dc37d2..aa70a21ad 100644 --- a/src/quick3d/quick3d/items/quick3dentity.cpp +++ b/src/quick3d/quick3d/items/quick3dentity.cpp @@ -121,3 +121,5 @@ void Quick3DEntity::qmlClearComponents(QQmlListProperty *list) } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_quick3dentity_p.cpp" diff --git a/src/quick3d/quick3d/items/quick3djoint.cpp b/src/quick3d/quick3d/items/quick3djoint.cpp index 903456dab..e0e6c3499 100644 --- a/src/quick3d/quick3d/items/quick3djoint.cpp +++ b/src/quick3d/quick3d/items/quick3djoint.cpp @@ -93,3 +93,5 @@ void Quick3DJoint::clearJoints(QQmlListProperty *list) } // 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 c5fe81e3f..385a47fd9 100644 --- a/src/quick3d/quick3d/items/quick3dnode.cpp +++ b/src/quick3d/quick3d/items/quick3dnode.cpp @@ -170,3 +170,5 @@ void Quick3DNode::childRemoved(int, QObject *obj) } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_quick3dnode_p.cpp" diff --git a/src/quick3d/quick3d/qquaternionanimation.cpp b/src/quick3d/quick3d/qquaternionanimation.cpp index 73acfb90d..70c125aec 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 dc2ef2f26..3e72d93ba 100644 --- a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp +++ b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp @@ -610,3 +610,5 @@ QString Quick3DMatrix4x4ValueType::toString() const } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qt3dquickvaluetypes_p.cpp" -- cgit v1.2.3 From 2a2e4838be697b73b8df7ed72194c31ba8f5d8a3 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Tue, 12 Jul 2022 08:25:10 +0200 Subject: RenderViewBuilder: use QAspectManager::idealThreadCount Rather than QThread::idealThreadCount which isn't cached and could potentially return different values over time unlike QAspectManager::idealThreadCount which is cached and constant. Change-Id: Icb5fa81c93aa95af7bf020739bfefdf7e298f986 Reviewed-by: Sean Harmer (cherry picked from commit 925dae358913d7c614223a57552837dcc6e171e7) Reviewed-by: Mike Krus Reviewed-by: Qt CI Bot Reviewed-by: Paul Lemire --- src/core/jobs/qaspectjobmanager.cpp | 22 +++++++++++++++++++++- src/core/jobs/qaspectjobmanager_p.h | 1 + src/core/jobs/qthreadpooler.cpp | 21 ++------------------- src/core/jobs/qthreadpooler_p.h | 2 -- src/plugins/renderers/opengl/renderer/renderer.cpp | 2 +- .../opengl/renderer/renderviewbuilder.cpp | 20 +++----------------- .../renderers/rhi/renderer/renderviewbuilder.cpp | 12 +++++------- .../renderers/rhi/renderer/renderviewbuilder_p.h | 2 +- tests/auto/core/threadpooler/tst_threadpooler.cpp | 2 +- 9 files changed, 35 insertions(+), 49 deletions(-) diff --git a/src/core/jobs/qaspectjobmanager.cpp b/src/core/jobs/qaspectjobmanager.cpp index 51073e3d1..6c3fe92d5 100644 --- a/src/core/jobs/qaspectjobmanager.cpp +++ b/src/core/jobs/qaspectjobmanager.cpp @@ -115,7 +115,7 @@ int QAspectJobManager::waitForAllJobs() void QAspectJobManager::waitForPerThreadFunction(JobFunction func, void *arg) { - const int threadCount = m_threadPooler->maxThreadCount(); + const int threadCount = QAspectJobManager::idealThreadCount(); QAtomicInt atomicCount(threadCount); QVector taskList; @@ -128,6 +128,26 @@ void QAspectJobManager::waitForPerThreadFunction(JobFunction func, void *arg) future.waitForFinished(); } +int QAspectJobManager::idealThreadCount() +{ + static int jobCount = 0; + if (jobCount) + return jobCount; + + const QByteArray maxThreadCount = qgetenv("QT3D_MAX_THREAD_COUNT"); + if (!maxThreadCount.isEmpty()) { + bool conversionOK = false; + const int maxThreadCountValue = maxThreadCount.toInt(&conversionOK); + if (conversionOK) { + jobCount = maxThreadCountValue; + return jobCount; + } + } + + jobCount = QThread::idealThreadCount(); + return jobCount; +} + } // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/jobs/qaspectjobmanager_p.h b/src/core/jobs/qaspectjobmanager_p.h index 14db36317..4c2e85171 100644 --- a/src/core/jobs/qaspectjobmanager_p.h +++ b/src/core/jobs/qaspectjobmanager_p.h @@ -79,6 +79,7 @@ public: int waitForAllJobs() override; void waitForPerThreadFunction(JobFunction func, void *arg) override; + static int idealThreadCount(); private: QThreadPooler *m_threadPooler; diff --git a/src/core/jobs/qthreadpooler.cpp b/src/core/jobs/qthreadpooler.cpp index 4c75431ce..51d73e1d8 100644 --- a/src/core/jobs/qthreadpooler.cpp +++ b/src/core/jobs/qthreadpooler.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qthreadpooler_p.h" +#include "qaspectjobmanager_p.h" #include QT_BEGIN_NAMESPACE @@ -52,7 +53,7 @@ QThreadPooler::QThreadPooler(QObject *parent) , m_threadPool(QThreadPool::globalInstance()) , m_totalRunJobs(0) { - m_threadPool->setMaxThreadCount(QThreadPooler::maxThreadCount()); + m_threadPool->setMaxThreadCount(QAspectJobManager::idealThreadCount()); // Ensures that threads will never be recycled m_threadPool->setExpiryTimeout(-1); } @@ -199,24 +200,6 @@ int QThreadPooler::currentCount() const return m_taskCount.loadRelaxed(); } -int QThreadPooler::maxThreadCount() -{ - static int threadCount = 0; - - if (threadCount == 0) { - threadCount = QThread::idealThreadCount(); - const QByteArray maxThreadCount = qgetenv("QT3D_MAX_THREAD_COUNT"); - if (!maxThreadCount.isEmpty()) { - bool conversionOK = false; - const int maxThreadCountValue = maxThreadCount.toInt(&conversionOK); - if (conversionOK) - threadCount = std::min(threadCount, maxThreadCountValue); - } - } - - return threadCount; -} - } // namespace Qt3DCore QT_END_NAMESPACE diff --git a/src/core/jobs/qthreadpooler_p.h b/src/core/jobs/qthreadpooler_p.h index c276fc322..04d764d1b 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 future(); - static int maxThreadCount(); - private: void enqueueTasks(const QVector &tasks); void skipTask(RunnableInterface *task); diff --git a/src/plugins/renderers/opengl/renderer/renderer.cpp b/src/plugins/renderers/opengl/renderer/renderer.cpp index 09d673447..d8d24204d 100644 --- a/src/plugins/renderers/opengl/renderer/renderer.cpp +++ b/src/plugins/renderers/opengl/renderer/renderer.cpp @@ -1952,7 +1952,7 @@ QVector Renderer::renderBinJobs() m_updatedDisableSubtreeEnablers.push_back(node->peerId()); } - int idealThreadCount = QThreadPooler::maxThreadCount(); + int idealThreadCount = Qt3DCore::QAspectJobManager::idealThreadCount(); const int fgBranchCount = m_frameGraphLeaves.size(); if (fgBranchCount > 1) { diff --git a/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp b/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp index c91568308..3af4fd935 100644 --- a/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp +++ b/src/plugins/renderers/opengl/renderer/renderviewbuilder.cpp @@ -41,6 +41,7 @@ #include #include +#include QT_BEGIN_NAMESPACE @@ -567,7 +568,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 @@ -917,22 +918,7 @@ bool RenderViewBuilder::lightCacheNeedsToBeRebuilt() const int RenderViewBuilder::defaultJobCount() { - static int jobCount = 0; - if (jobCount) - return jobCount; - - const QByteArray maxThreadCount = qgetenv("QT3D_MAX_THREAD_COUNT"); - if (!maxThreadCount.isEmpty()) { - bool conversionOK = false; - const int maxThreadCountValue = maxThreadCount.toInt(&conversionOK); - if (conversionOK) { - jobCount = maxThreadCountValue; - return jobCount; - } - } - - jobCount = QThread::idealThreadCount(); - return jobCount; + return Qt3DCore::QAspectJobManager::idealThreadCount(); } int RenderViewBuilder::optimalJobCount() const diff --git a/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp b/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp index 06fedc3fb..204c71cf0 100644 --- a/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp +++ b/src/plugins/renderers/rhi/renderer/renderviewbuilder.cpp @@ -39,19 +39,13 @@ #include "renderviewbuilder_p.h" #include - -#include +#include namespace Qt3DRender { namespace Render { namespace Rhi { -// 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 -const int RenderViewBuilder::m_optimalParallelJobCount = QThread::idealThreadCount(); - namespace { int findIdealNumberOfWorkers(int elementCount, int packetSize = 100) @@ -498,6 +492,10 @@ RenderViewBuilder::RenderViewBuilder(Render::FrameGraphNode *leafNode, int rende m_syncFilterEntityByLayerJob(), m_filterProximityJob(Render::FilterProximityDistanceJobPtr::create()) { + // 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 = Qt3DCore::QAspectJobManager::idealThreadCount(); } RenderViewInitializerJobPtr RenderViewBuilder::renderViewJob() const diff --git a/src/plugins/renderers/rhi/renderer/renderviewbuilder_p.h b/src/plugins/renderers/rhi/renderer/renderviewbuilder_p.h index 143803f3c..9dd95ed72 100644 --- a/src/plugins/renderers/rhi/renderer/renderviewbuilder_p.h +++ b/src/plugins/renderers/rhi/renderer/renderviewbuilder_p.h @@ -139,7 +139,7 @@ private: SynchronizerJobPtr m_syncMaterialGathererJob; FilterProximityDistanceJobPtr m_filterProximityJob; - static const int m_optimalParallelJobCount; + int m_optimalParallelJobCount; }; } // Rhi diff --git a/tests/auto/core/threadpooler/tst_threadpooler.cpp b/tests/auto/core/threadpooler/tst_threadpooler.cpp index 289f0b103..8941d8489 100644 --- a/tests/auto/core/threadpooler/tst_threadpooler.cpp +++ b/tests/auto/core/threadpooler/tst_threadpooler.cpp @@ -194,7 +194,7 @@ void tst_ThreadPooler::defaultPerThread() { // GIVEN QAtomicInt callCounter; - int maxThreadCount = QThread::idealThreadCount(); + int maxThreadCount = Qt3DCore::QAspectJobManager::idealThreadCount(); callCounter.storeRelaxed(0); // WHEN -- cgit v1.2.3 From c9bb0a3d1ef819033a674c5c05499d18bc898a70 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Tue, 23 Aug 2022 10:03:41 +0200 Subject: Start using a dedicated QThreadPool again instead of a global one This basically reverts a2b5b5c8f6e09ccfaca8044b34f4d9675c3be14a. The global thread pool is also available to the user and by changing the max thread count to something lower than the default, already running threads get stopped, which can cause segfaults. Fixes: QTBUG-104593 Change-Id: I21fea3137ea72b3336bc67499f9ee2f846e18845 Reviewed-by: Paul Lemire (cherry picked from commit f286d11852d956e589e30cf32686179baa28f66c) Reviewed-by: Qt Cherry-pick Bot --- src/core/jobs/qthreadpooler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/jobs/qthreadpooler.cpp b/src/core/jobs/qthreadpooler.cpp index 51d73e1d8..22a515171 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()); -- cgit v1.2.3 From dc68b942aaf17338e4e74d959ab6f56b2134e1a4 Mon Sep 17 00:00:00 2001 From: CI Insignificant Platforms Monitor Bot Date: Sat, 10 Sep 2022 02:48:07 +0000 Subject: Blacklist 1 tests in tst_dynamicnodecreation on ubuntu-20.04 - createEntityAndDynamicChild Task-number: QTBUG-106519 Change-Id: I7f5a329409685f41590cc2eb776159ce307cdfcf Reviewed-by: CI Insignificant Platforms Monitor Bot --- tests/auto/quick3d/dynamicnodecreation/BLACKLIST | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 tests/auto/quick3d/dynamicnodecreation/BLACKLIST diff --git a/tests/auto/quick3d/dynamicnodecreation/BLACKLIST b/tests/auto/quick3d/dynamicnodecreation/BLACKLIST new file mode 100644 index 000000000..a1b7ead84 --- /dev/null +++ b/tests/auto/quick3d/dynamicnodecreation/BLACKLIST @@ -0,0 +1,3 @@ +# See qtbase/src/testlib/qtestblacklist.cpp for format +[createEntityAndDynamicChild] +ci ubuntu-20.04 # QTBUG-106519 -- cgit v1.2.3