diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-09 15:52:53 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-10 08:20:59 +0300 |
| commit | f15bcc41a2be8aa2267f4abf23e99bac72b594b4 (patch) | |
| tree | 771fd956942b19054a2fa635a4d6d8741e54fdaa /src/datavisualizationqml2/abstractdeclarative_p.h | |
| parent | e9dc0f74f5cc06eb5edc3c16a63c9e6e89422584 (diff) | |
Fix selectedElement qmldesigner crash
Also fix some minor inconsistencies in the API.
Change-Id: Ia31321a1f70d132173a909fef68fd3b59e06e080
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/abstractdeclarative_p.h')
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index ebe8b49c..dfcd9537 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -132,6 +132,8 @@ public: virtual void setShadowQuality(ShadowQuality quality); virtual AbstractDeclarative::ShadowQuality shadowQuality() const; + virtual AbstractDeclarative::ElementType selectedElement() const; + virtual bool shadowsSupported() const; virtual void setMsaaSamples(int samples); @@ -185,8 +187,6 @@ public: void setOrthoProjection(bool enable); bool isOrthoProjection() const; - AbstractDeclarative::ElementType selectedElement() const; - void setAspectRatio(qreal ratio); qreal aspectRatio() const; @@ -211,6 +211,8 @@ protected: virtual void updateWindowParameters(); virtual void handleSelectionModeChange(QAbstract3DGraph::SelectionFlags mode); virtual void handleShadowQualityChange(QAbstract3DGraph::ShadowQuality quality); + virtual void handleSelectedElementChange(QAbstract3DGraph::ElementType type); + virtual void handleOptimizationHintChange(QAbstract3DGraph::OptimizationHints hints); virtual QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *); signals: @@ -224,10 +226,10 @@ signals: void renderingModeChanged(AbstractDeclarative::RenderingMode mode); Q_REVISION(1) void measureFpsChanged(bool enabled); Q_REVISION(1) void currentFpsChanged(qreal fps); - Q_REVISION(1) void selectedElementChanged(QAbstract3DGraph::ElementType type); + Q_REVISION(1) void selectedElementChanged(AbstractDeclarative::ElementType type); Q_REVISION(1) void orthoProjectionChanged(bool enabled); Q_REVISION(1) void aspectRatioChanged(qreal ratio); - Q_REVISION(1) void optimizationHintsChanged(QAbstract3DGraph::OptimizationHints hints); + Q_REVISION(1) void optimizationHintsChanged(AbstractDeclarative::OptimizationHints hints); private: QPointer<Abstract3DController> m_controller; |