diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-20 08:44:50 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2014-10-22 10:45:16 +0200 |
commit | 5d31b5f774475f87a00447c4eac6eb96e9651675 (patch) | |
tree | e0206fbc355033b2d41a2ef423feb5c8fc488e8e /src/render/frontend/qmesh.cpp | |
parent | 0c8a6df93997e7aba0c8269ce986bd8fe4168d5b (diff) |
QAbstractMeshData merged with QMeshData and moved to Renderer
That implied moving QAbstractMesh to Renderer as well.
Change-Id: I9013bf0458b849f7805d214a70580a80e86d8c84
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qmesh.cpp')
-rw-r--r-- | src/render/frontend/qmesh.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/frontend/qmesh.cpp b/src/render/frontend/qmesh.cpp index e4e5b54d8..d48a70089 100644 --- a/src/render/frontend/qmesh.cpp +++ b/src/render/frontend/qmesh.cpp @@ -59,7 +59,7 @@ class MeshFunctor : public QAbstractMeshFunctor { public : MeshFunctor(const QString &sourcePath); - QAbstractMeshDataPtr operator()() Q_DECL_OVERRIDE; + QMeshDataPtr operator()() Q_DECL_OVERRIDE; bool operator ==(const QAbstractMeshFunctor &other) const Q_DECL_OVERRIDE; private: @@ -117,7 +117,7 @@ MeshFunctor::MeshFunctor(const QString &sourcePath) { } -QAbstractMeshDataPtr MeshFunctor::operator()() +QMeshDataPtr MeshFunctor::operator()() { if (m_sourcePath.isEmpty()) { qCWarning(Render::Jobs) << Q_FUNC_INFO << "Mesh is empty, nothing to load"; |