diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-01-06 16:20:20 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-01-06 16:08:06 +0000 |
| commit | 45902994198374a02f7c127120d8980a66796fb6 (patch) | |
| tree | a95b14e7c45542584df6efff13983f1e4fb63fbe /src/render/defaults/qdiffusemapmaterial.h | |
| parent | d61673010fcc67d60e76619941fac714d0141323 (diff) | |
Fix dynamic texture provider property handling
The Q_PROPERTY has to include the namespace, otherwise setting
properties via QObject::setProperty() will fail.
Change-Id: Ifdf7012fd8b670710bac38eb0e5ce8eab057e719
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/defaults/qdiffusemapmaterial.h')
| -rw-r--r-- | src/render/defaults/qdiffusemapmaterial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h index d948ae7aa..5367abe9d 100644 --- a/src/render/defaults/qdiffusemapmaterial.h +++ b/src/render/defaults/qdiffusemapmaterial.h @@ -53,7 +53,7 @@ class QT3DRENDERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged) Q_PROPERTY(QColor specular READ specular WRITE setSpecular NOTIFY specularChanged) Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged) - Q_PROPERTY(QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) + Q_PROPERTY(Qt3DRender::QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged) Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: |