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>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp
index 09c75ceb..da2e2a14 100644
--- a/src/datavisualization/engine/abstract3dcontroller.cpp
+++ b/src/datavisualization/engine/abstract3dcontroller.cpp
@@ -35,12 +35,12 @@
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
-Abstract3DController::Abstract3DController(QRect initialViewport, QObject *parent) :
+Abstract3DController::Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent) :
     QObject(parent),
     m_themeManager(new ThemeManager(this)),
     m_selectionMode(QDataVis::SelectionItem),
     m_shadowQuality(QDataVis::ShadowQualityMedium),
-    m_scene(new Q3DScene()),
+    m_scene(scene),
     m_activeInputHandler(0),
     m_axisX(0),
     m_axisY(0),
@@ -51,6 +51,9 @@ Abstract3DController::Abstract3DController(QRect initialViewport, QObject *paren
     m_isSeriesVisualsDirty(true),
     m_renderPending(false)
 {
+    if (!m_scene)
+        m_scene = new Q3DScene;
+
     // Set initial theme
     setActiveTheme(new Q3DTheme(Q3DTheme::ThemeQt));