diff options
author | Mike Krus <mike.krus@kdab.com> | 2022-06-21 10:59:33 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2022-06-29 13:33:32 +0100 |
commit | d01466cee0515da272034e8f57df35ab103cc0c8 (patch) | |
tree | a17de5fd4025d4c31b43a0b71780269fe27cb060 | |
parent | c43e5871a8bdabfbeb16bb778eb0165e2b15fff8 (diff) | |
download | qt3d-d01466cee0515da272034e8f57df35ab103cc0c8.tar.gz |
Qt3DExtras: includemocs
(manual pick from dev as 6.4 was missing)
Task-number: QTBUG-103286
Change-Id: Ia990c5ea9a3fdcef2fea94b471a743de13c52e3b
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
44 files changed, 88 insertions, 0 deletions
diff --git a/src/extras/3dtext/qextrudedtextgeometry.cpp b/src/extras/3dtext/qextrudedtextgeometry.cpp index 4987dfe97..a15fc2b4b 100644 --- a/src/extras/3dtext/qextrudedtextgeometry.cpp +++ b/src/extras/3dtext/qextrudedtextgeometry.cpp @@ -466,3 +466,5 @@ Qt3DCore::QAttribute *QExtrudedTextGeometry::indexAttribute() const } // Qt3DExtras QT_END_NAMESPACE + +#include "moc_qextrudedtextgeometry.cpp" diff --git a/src/extras/3dtext/qextrudedtextmesh.cpp b/src/extras/3dtext/qextrudedtextmesh.cpp index 40d9c3b7f..e6e80a787 100644 --- a/src/extras/3dtext/qextrudedtextmesh.cpp +++ b/src/extras/3dtext/qextrudedtextmesh.cpp @@ -120,3 +120,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 ceaf45e0a..88498d5f2 100644 --- a/src/extras/defaults/qabstractspritesheet.cpp +++ b/src/extras/defaults/qabstractspritesheet.cpp @@ -105,3 +105,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 09c416e59..6fbdc0469 100644 --- a/src/extras/defaults/qdiffusemapmaterial.cpp +++ b/src/extras/defaults/qdiffusemapmaterial.cpp @@ -323,3 +323,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 e67de5882..de343e1e7 100644 --- a/src/extras/defaults/qdiffusespecularmapmaterial.cpp +++ b/src/extras/defaults/qdiffusespecularmapmaterial.cpp @@ -342,3 +342,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 4d478abac..e8f60cd73 100644 --- a/src/extras/defaults/qdiffusespecularmaterial.cpp +++ b/src/extras/defaults/qdiffusespecularmaterial.cpp @@ -503,3 +503,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 cfe238c7c..f1594c135 100644 --- a/src/extras/defaults/qforwardrenderer.cpp +++ b/src/extras/defaults/qforwardrenderer.cpp @@ -358,3 +358,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 0b938c53c..e9be354c4 100644 --- a/src/extras/defaults/qgoochmaterial.cpp +++ b/src/extras/defaults/qgoochmaterial.cpp @@ -341,3 +341,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 d62ec08cf..86752a32c 100644 --- a/src/extras/defaults/qmetalroughmaterial.cpp +++ b/src/extras/defaults/qmetalroughmaterial.cpp @@ -469,3 +469,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 63253f98f..ad2b17dc8 100644 --- a/src/extras/defaults/qmorphphongmaterial.cpp +++ b/src/extras/defaults/qmorphphongmaterial.cpp @@ -297,3 +297,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 040622419..62ce86b62 100644 --- a/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp +++ b/src/extras/defaults/qnormaldiffusemapalphamaterial.cpp @@ -183,3 +183,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 8a11a90c7..c77f954d9 100644 --- a/src/extras/defaults/qnormaldiffusemapmaterial.cpp +++ b/src/extras/defaults/qnormaldiffusemapmaterial.cpp @@ -372,3 +372,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 3eb9a08a2..22713da40 100644 --- a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp +++ b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp @@ -389,3 +389,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 c192da705..89e0ccbbf 100644 --- a/src/extras/defaults/qpervertexcolormaterial.cpp +++ b/src/extras/defaults/qpervertexcolormaterial.cpp @@ -139,3 +139,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 646ad3c90..716451619 100644 --- a/src/extras/defaults/qphongalphamaterial.cpp +++ b/src/extras/defaults/qphongalphamaterial.cpp @@ -434,3 +434,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 5dae299ef..cb6c1f32d 100644 --- a/src/extras/defaults/qphongmaterial.cpp +++ b/src/extras/defaults/qphongmaterial.cpp @@ -274,3 +274,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 6df01c0e6..8f9718465 100644 --- a/src/extras/defaults/qskyboxentity.cpp +++ b/src/extras/defaults/qskyboxentity.cpp @@ -348,3 +348,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 4ed16f671..f916c31a2 100644 --- a/src/extras/defaults/qspritegrid.cpp +++ b/src/extras/defaults/qspritegrid.cpp @@ -118,3 +118,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 25b5c91c0..1e5291f66 100644 --- a/src/extras/defaults/qspritesheet.cpp +++ b/src/extras/defaults/qspritesheet.cpp @@ -135,3 +135,5 @@ void QSpriteSheet::setSprites(QList<QSpriteSheetItem *> sprites) } // namespace Qt3DExtras QT_END_NAMESPACE + +#include "moc_qspritesheet.cpp" diff --git a/src/extras/defaults/qspritesheetitem.cpp b/src/extras/defaults/qspritesheetitem.cpp index f85df485c..04df89dfc 100644 --- a/src/extras/defaults/qspritesheetitem.cpp +++ b/src/extras/defaults/qspritesheetitem.cpp @@ -89,3 +89,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 58040c945..54a47c92b 100644 --- a/src/extras/defaults/qt3dwindow.cpp +++ b/src/extras/defaults/qt3dwindow.cpp @@ -316,3 +316,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 23f93f379..1fd5a525f 100644 --- a/src/extras/defaults/qtexturematerial.cpp +++ b/src/extras/defaults/qtexturematerial.cpp @@ -266,3 +266,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 2eb026632..627be3338 100644 --- a/src/extras/geometries/qconegeometry.cpp +++ b/src/extras/geometries/qconegeometry.cpp @@ -637,3 +637,5 @@ QAttribute *QConeGeometry::indexAttribute() const } // namespace Qt3DExtras QT_END_NAMESPACE + +#include "moc_qconegeometry.cpp" diff --git a/src/extras/geometries/qconegeometryview.cpp b/src/extras/geometries/qconegeometryview.cpp index e94e5e026..284ee80c1 100644 --- a/src/extras/geometries/qconegeometryview.cpp +++ b/src/extras/geometries/qconegeometryview.cpp @@ -202,3 +202,5 @@ float QConeGeometryView::length() const } // namespace Qt3DExtras QT_END_NAMESPACE + +#include "moc_qconegeometryview.cpp" diff --git a/src/extras/geometries/qconemesh.cpp b/src/extras/geometries/qconemesh.cpp index 1c50bd167..60bede77e 100644 --- a/src/extras/geometries/qconemesh.cpp +++ b/src/extras/geometries/qconemesh.cpp @@ -202,3 +202,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 f38d82866..954a5d39e 100644 --- a/src/extras/geometries/qcuboidgeometry.cpp +++ b/src/extras/geometries/qcuboidgeometry.cpp @@ -802,3 +802,5 @@ QAttribute *QCuboidGeometry::indexAttribute() const } // Qt3DExtras QT_END_NAMESPACE + +#include "moc_qcuboidgeometry.cpp" diff --git a/src/extras/geometries/qcuboidgeometryview.cpp b/src/extras/geometries/qcuboidgeometryview.cpp index 3f9ef5a86..8ef0a79fc 100644 --- a/src/extras/geometries/qcuboidgeometryview.cpp +++ b/src/extras/geometries/qcuboidgeometryview.cpp @@ -189,3 +189,5 @@ QSize QCuboidGeometryView::xyMeshResolution() const } // namespace Qt3DExtras QT_END_NAMESPACE + +#include "moc_qcuboidgeometryview.cpp" diff --git a/src/extras/geometries/qcuboidmesh.cpp b/src/extras/geometries/qcuboidmesh.cpp index b3d7609c5..509bfd4d6 100644 --- a/src/extras/geometries/qcuboidmesh.cpp +++ b/src/extras/geometries/qcuboidmesh.cpp @@ -189,3 +189,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 0facd1d97..c06cb7faf 100644 --- a/src/extras/geometries/qcylindergeometry.cpp +++ b/src/extras/geometries/qcylindergeometry.cpp @@ -510,3 +510,5 @@ QAttribute *QCylinderGeometry::indexAttribute() const } // namespace Qt3DExtras QT_END_NAMESPACE + +#include "moc_qcylindergeometry.cpp" diff --git a/src/extras/geometries/qcylindergeometryview.cpp b/src/extras/geometries/qcylindergeometryview.cpp index 014ea295d..1c1d392ff 100644 --- a/src/extras/geometries/qcylindergeometryview.cpp +++ b/src/extras/geometries/qcylindergeometryview.cpp @@ -146,3 +146,5 @@ float QCylinderGeometryView::length() const } // namespace Qt3DExtras QT_END_NAMESPACE + +#include "moc_qcylindergeometryview.cpp" diff --git a/src/extras/geometries/qcylindermesh.cpp b/src/extras/geometries/qcylindermesh.cpp index 238c0e0b8..f0098ef1e 100644 --- a/src/extras/geometries/qcylindermesh.cpp +++ b/src/extras/geometries/qcylindermesh.cpp @@ -146,3 +146,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 3c0839c57..6d0199e07 100644 --- a/src/extras/geometries/qplanegeometry.cpp +++ b/src/extras/geometries/qplanegeometry.cpp @@ -481,3 +481,5 @@ QByteArray QPlaneGeometryPrivate::generateIndexData() const } // Qt3DExtras QT_END_NAMESPACE + +#include "moc_qplanegeometry.cpp" diff --git a/src/extras/geometries/qplanegeometryview.cpp b/src/extras/geometries/qplanegeometryview.cpp index cf06d9725..4dce8c32b 100644 --- a/src/extras/geometries/qplanegeometryview.cpp +++ b/src/extras/geometries/qplanegeometryview.cpp @@ -137,3 +137,5 @@ bool QPlaneGeometryView::mirrored() const } // namespace Qt3DExtras QT_END_NAMESPACE + +#include "moc_qplanegeometryview.cpp" diff --git a/src/extras/geometries/qplanemesh.cpp b/src/extras/geometries/qplanemesh.cpp index c3307e609..2b02210dd 100644 --- a/src/extras/geometries/qplanemesh.cpp +++ b/src/extras/geometries/qplanemesh.cpp @@ -139,3 +139,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 d89a54911..f078cd9ab 100644 --- a/src/extras/geometries/qspheregeometry.cpp +++ b/src/extras/geometries/qspheregeometry.cpp @@ -505,3 +505,5 @@ QAttribute *QSphereGeometry::indexAttribute() const QT_END_NAMESPACE +#include "moc_qspheregeometry.cpp" + diff --git a/src/extras/geometries/qspheregeometryview.cpp b/src/extras/geometries/qspheregeometryview.cpp index 791df8889..c4a99a108 100644 --- a/src/extras/geometries/qspheregeometryview.cpp +++ b/src/extras/geometries/qspheregeometryview.cpp @@ -136,3 +136,5 @@ float QSphereGeometryView::radius() const } // Qt3DExtras QT_END_NAMESPACE + +#include "moc_qspheregeometryview.cpp" diff --git a/src/extras/geometries/qspheremesh.cpp b/src/extras/geometries/qspheremesh.cpp index f22f03bb6..92c382541 100644 --- a/src/extras/geometries/qspheremesh.cpp +++ b/src/extras/geometries/qspheremesh.cpp @@ -136,3 +136,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 92464b27e..3e303953b 100644 --- a/src/extras/geometries/qtorusgeometry.cpp +++ b/src/extras/geometries/qtorusgeometry.cpp @@ -465,3 +465,5 @@ QAttribute *QTorusGeometry::indexAttribute() const } // Qt3DExtras QT_END_NAMESPACE + +#include "moc_qtorusgeometry.cpp" diff --git a/src/extras/geometries/qtorusgeometryview.cpp b/src/extras/geometries/qtorusgeometryview.cpp index 547cb1a30..e8c61f2f3 100644 --- a/src/extras/geometries/qtorusgeometryview.cpp +++ b/src/extras/geometries/qtorusgeometryview.cpp @@ -139,3 +139,5 @@ float QTorusGeometryView::minorRadius() const } // namespace Qt3DExtras QT_END_NAMESPACE + +#include "moc_qtorusgeometryview.cpp" diff --git a/src/extras/geometries/qtorusmesh.cpp b/src/extras/geometries/qtorusmesh.cpp index 6590c8829..fb4b4f49e 100644 --- a/src/extras/geometries/qtorusmesh.cpp +++ b/src/extras/geometries/qtorusmesh.cpp @@ -140,3 +140,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 888df9775..afade172c 100644 --- a/src/extras/text/distancefieldtextrenderer.cpp +++ b/src/extras/text/distancefieldtextrenderer.cpp @@ -118,3 +118,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 52cbd343c..393bc97f5 100644 --- a/src/extras/text/qtext2dentity.cpp +++ b/src/extras/text/qtext2dentity.cpp @@ -454,3 +454,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 def21f560..bbb594667 100644 --- a/src/extras/text/qtext2dmaterial.cpp +++ b/src/extras/text/qtext2dmaterial.cpp @@ -159,3 +159,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 0a4dd9774..b6319005d 100644 --- a/src/extras/text/qtextureatlas.cpp +++ b/src/extras/text/qtextureatlas.cpp @@ -261,3 +261,5 @@ int QTextureAtlas::imagePadding(TextureId id) const } // namespace Qt3DExtras QT_END_NAMESPACE + +#include "moc_qtextureatlas_p.cpp" |