diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-15 12:52:02 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-15 12:56:39 +0300 |
commit | 7861ae308bd9fd495f677400cc07c657a1439656 (patch) | |
tree | 994bab0cd5a31728ec653c2b3886ee15bed8ced0 /src/datavisualizationqml2 | |
parent | 0109b085710bfabc81faf43118ad5654cbd96081 (diff) |
Fix crashes and bugs when using surface with ES2
+Fix compile warnings
+Fix qmlsurface example
Change-Id: I28bbf38e7aa51b1ec315374182a9daae8eded87c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2')
-rw-r--r-- | src/datavisualizationqml2/declarativesurface.cpp | 3 | ||||
-rw-r--r-- | src/datavisualizationqml2/declarativesurface_p.h | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp index 8375fa53..af3e059b 100644 --- a/src/datavisualizationqml2/declarativesurface.cpp +++ b/src/datavisualizationqml2/declarativesurface.cpp @@ -41,6 +41,9 @@ DeclarativeSurface::DeclarativeSurface(QQuickItem *parent) m_shared = new Surface3DController(boundingRect().toRect()); setSharedController(m_shared); + QObject::connect(m_shared, &Surface3DController::smoothSurfaceEnabledChanged, this, + &DeclarativeSurface::smoothSurfaceEnabledChanged); + QItemModelSurfaceDataProxy *proxy = new QItemModelSurfaceDataProxy; m_shared->setActiveDataProxy(proxy); } diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h index 6ba52146..6e35b3b3 100644 --- a/src/datavisualizationqml2/declarativesurface_p.h +++ b/src/datavisualizationqml2/declarativesurface_p.h @@ -51,7 +51,7 @@ class DeclarativeSurface : public AbstractDeclarative Q_PROPERTY(Q3DValueAxis *axisX READ axisX WRITE setAxisX) Q_PROPERTY(Q3DValueAxis *axisY READ axisY WRITE setAxisY) Q_PROPERTY(Q3DValueAxis *axisZ READ axisZ WRITE setAxisZ) - Q_PROPERTY(bool smoothSurfaceEnabled READ isSmoothSurfaceEnabled WRITE setSmoothSurfaceEnabled) + Q_PROPERTY(bool smoothSurfaceEnabled READ isSmoothSurfaceEnabled WRITE setSmoothSurfaceEnabled NOTIFY smoothSurfaceEnabledChanged) Q_PROPERTY(bool surfaceGridEnabled READ isSurfaceGridEnabled WRITE setSurfaceGridEnabled) Q_PROPERTY(ColorGradient *gradient READ gradient WRITE setGradient) @@ -78,6 +78,9 @@ public: void setGradient(ColorGradient *gradient); ColorGradient *gradient() const; +signals: + void smoothSurfaceEnabledChanged(bool enabled); + protected: void handleGradientUpdate(); |