diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-09-05 16:10:38 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-11-23 20:24:12 +0000 |
commit | fcba0af563b16bb9e39305d8291d4ced3b867e01 (patch) | |
tree | 81c85ed4b97fb953f951533bae3faf29bdc14440 /src/render/geometry | |
parent | c2c8d9554541b6a1068bfa44de04f086f5d592c6 (diff) |
QMesh: move functor to private header for tests
Change-Id: I77fc6334cf84ee1aac3337e5459b189e01f62c6e
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Diffstat (limited to 'src/render/geometry')
-rw-r--r-- | src/render/geometry/qmesh.cpp | 14 | ||||
-rw-r--r-- | src/render/geometry/qmesh_p.h | 15 |
2 files changed, 15 insertions, 14 deletions
diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp index 3e0cab8ae..30e8a9460 100644 --- a/src/render/geometry/qmesh.cpp +++ b/src/render/geometry/qmesh.cpp @@ -52,20 +52,6 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class MeshFunctor : public QGeometryFactory -{ -public : - MeshFunctor(const QUrl &sourcePath, const QString &meshName = QString()); - QGeometry *operator()() Q_DECL_OVERRIDE; - bool operator ==(const QGeometryFactory &other) const Q_DECL_OVERRIDE; - QT3D_FUNCTOR(MeshFunctor) - -private: - QUrl m_sourcePath; - QString m_meshName; -}; - - QMeshPrivate::QMeshPrivate() : QGeometryRendererPrivate() { diff --git a/src/render/geometry/qmesh_p.h b/src/render/geometry/qmesh_p.h index c9a6cc1e8..a621525cc 100644 --- a/src/render/geometry/qmesh_p.h +++ b/src/render/geometry/qmesh_p.h @@ -71,6 +71,21 @@ public: QString m_meshName; }; + +class Q_AUTOTEST_EXPORT MeshFunctor : public QGeometryFactory +{ +public : + MeshFunctor(const QUrl &sourcePath, const QString &meshName = QString()); + QGeometry *operator()() Q_DECL_OVERRIDE; + bool operator ==(const QGeometryFactory &other) const Q_DECL_OVERRIDE; + QT3D_FUNCTOR(MeshFunctor) + +private: + QUrl m_sourcePath; + QString m_meshName; +}; + + } // namespace Qt3DRender QT_END_NAMESPACE |