diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-09 08:29:11 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-09 10:36:34 +0200 |
| commit | 997bc1f796938eb8347adfd79b6756ea8b2b3ab9 (patch) | |
| tree | 774caa0e102ad2eaf9300571dfba2906ba95889c /src/datavisualizationqml2/abstractdeclarative_p.h | |
| parent | 0144b397eff1340497ac2e599f7d9238bf99609c (diff) | |
Invalid point/selection as constant property in qml
Also fixed 0,0 QPoint -> QPointF conversion issue for Q3DScene
Task-number: QTRD-2688
Change-Id: I3778081bb6ef2b5dbfcaad7502a4e164286c2646
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/abstractdeclarative_p.h')
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h index 5da22df3..b62090c1 100644 --- a/src/datavisualizationqml2/abstractdeclarative_p.h +++ b/src/datavisualizationqml2/abstractdeclarative_p.h @@ -32,6 +32,7 @@ #include "datavisualizationglobal_p.h" #include "abstract3dcontroller_p.h" #include "qabstract3dinputhandler.h" +#include "declarativescene_p.h" #include <QAbstractItemModel> #include <QQuickItem> @@ -45,7 +46,7 @@ class AbstractDeclarative : public QQuickItem Q_OBJECT Q_PROPERTY(QtDataVisualization::QDataVis::SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged) Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged) - Q_PROPERTY(Q3DScene* scene READ scene NOTIFY sceneChanged) + Q_PROPERTY(Declarative3DScene* scene READ scene NOTIFY sceneChanged) Q_PROPERTY(QAbstract3DInputHandler* inputHandler READ inputHandler WRITE setInputHandler NOTIFY inputHandlerChanged) Q_PROPERTY(Q3DTheme* theme READ theme WRITE setTheme NOTIFY themeChanged) Q_PROPERTY(bool clearWindowBeforeRendering READ clearWindowBeforeRendering WRITE setClearWindowBeforeRendering NOTIFY clearWindowBeforeRenderingChanged) @@ -60,7 +61,7 @@ public: virtual void setShadowQuality(QDataVis::ShadowQuality quality); virtual QDataVis::ShadowQuality shadowQuality() const; - virtual Q3DScene *scene() const; + virtual Declarative3DScene *scene() const; virtual QAbstract3DInputHandler *inputHandler() const; virtual void setInputHandler(QAbstract3DInputHandler *inputHandler); |