diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-06-19 10:37:25 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-06-19 10:37:25 +0100 |
| commit | 5af4e423be269a9edf3037ff0302d438f077de04 (patch) | |
| tree | a7e5eb78a718921141380658f00f1caedcdb1ba4 /src/render/geometry/qmesh_p.h | |
| parent | 02e960493ef9a2f8dc25a06616fbde8fd869d1af (diff) | |
| parent | 01a6bcd086cecef3169e5d79bd72dbb0d1393a0f (diff) | |
Merge branch '5.9' into dev
Conflicts:
src/render/frontend/qcameralens_p.h
src/render/texture/qtexture.cpp
src/render/texture/qtexture_p.h
Change-Id: I20b25cf123f44c96f69ca5f8e042a38692e5cb49
Diffstat (limited to 'src/render/geometry/qmesh_p.h')
| -rw-r--r-- | src/render/geometry/qmesh_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/render/geometry/qmesh_p.h b/src/render/geometry/qmesh_p.h index f7f8079eb..1f602ba89 100644 --- a/src/render/geometry/qmesh_p.h +++ b/src/render/geometry/qmesh_p.h @@ -53,6 +53,7 @@ #include <Qt3DCore/private/qdownloadhelperservice_p.h> #include <Qt3DRender/private/qgeometryrenderer_p.h> +#include <Qt3DRender/private/qt3drender_global_p.h> #include <QUrl> QT_BEGIN_NAMESPACE @@ -61,7 +62,7 @@ namespace Qt3DRender { class QMesh; -class QMeshPrivate : public QGeometryRendererPrivate +class QT3DRENDERSHARED_PRIVATE_EXPORT QMeshPrivate : public QGeometryRendererPrivate { public: QMeshPrivate(); |