diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-06-19 08:20:50 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-06-19 08:20:51 +0200 |
| commit | e35b41fa9f713dcbfb7299b9effeadf52cfb6353 (patch) | |
| tree | 548a7b2243ed5bd70e4599dfcf0198f0fedddf05 /src/render/materialsystem | |
| parent | 9c28631440e37444ade0a1e1634d8f4d46bcd4d7 (diff) | |
| parent | 01a6bcd086cecef3169e5d79bd72dbb0d1393a0f (diff) | |
Merge 5.9 into 5.9.1
Change-Id: Iaf884c049a4d109a0bb92e01c1e9f081ad5ce2b8
Diffstat (limited to 'src/render/materialsystem')
| -rw-r--r-- | src/render/materialsystem/qeffect_p.h | 3 | ||||
| -rw-r--r-- | src/render/materialsystem/qfilterkey_p.h | 3 | ||||
| -rw-r--r-- | src/render/materialsystem/qgraphicsapifilter_p.h | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/render/materialsystem/qeffect_p.h b/src/render/materialsystem/qeffect_p.h index 716bb76de..39c7d1ecc 100644 --- a/src/render/materialsystem/qeffect_p.h +++ b/src/render/materialsystem/qeffect_p.h @@ -53,6 +53,7 @@ #include <private/qnode_p.h> #include <Qt3DRender/qt3drender_global.h> +#include <Qt3DRender/private/qt3drender_global_p.h> QT_BEGIN_NAMESPACE @@ -62,7 +63,7 @@ class QEffect; class QParameter; class QTechnique; -class QEffectPrivate : public Qt3DCore::QNodePrivate +class QT3DRENDERSHARED_PRIVATE_EXPORT QEffectPrivate : public Qt3DCore::QNodePrivate { public : QEffectPrivate(); diff --git a/src/render/materialsystem/qfilterkey_p.h b/src/render/materialsystem/qfilterkey_p.h index 3a9855f08..4050bc295 100644 --- a/src/render/materialsystem/qfilterkey_p.h +++ b/src/render/materialsystem/qfilterkey_p.h @@ -53,12 +53,13 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DRender/qfilterkey.h> +#include <Qt3DRender/private/qt3drender_global_p.h> QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QFilterKeyPrivate : public Qt3DCore::QNodePrivate +class QT3DRENDERSHARED_PRIVATE_EXPORT QFilterKeyPrivate : public Qt3DCore::QNodePrivate { public: QFilterKeyPrivate(); diff --git a/src/render/materialsystem/qgraphicsapifilter_p.h b/src/render/materialsystem/qgraphicsapifilter_p.h index 723eb14c2..5a7d874ed 100644 --- a/src/render/materialsystem/qgraphicsapifilter_p.h +++ b/src/render/materialsystem/qgraphicsapifilter_p.h @@ -42,6 +42,7 @@ #include <private/qobject_p.h> #include <Qt3DRender/qgraphicsapifilter.h> +#include <Qt3DRender/private/qt3drender_global_p.h> // // W A R N I N G @@ -74,7 +75,7 @@ struct Q_AUTOTEST_EXPORT GraphicsApiFilterData bool operator <(const GraphicsApiFilterData &other) const; }; -class Q_AUTOTEST_EXPORT QGraphicsApiFilterPrivate : public QObjectPrivate +class QT3DRENDERSHARED_PRIVATE_EXPORT QGraphicsApiFilterPrivate : public QObjectPrivate { public: QGraphicsApiFilterPrivate() |