16 files changed, 43 insertions, 35 deletions
diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp
index 6f0973cc..fea0b359 100644
--- a/src/datavisualization/data/qbar3dseries.cpp
+++ b/src/datavisualization/data/qbar3dseries.cpp
@@ -93,16 +93,16 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  * Selects a bar at the \a position. The \a position is the (row, column) position in
  * the data array of the series.
  * Only one bar can be selected at a time.
- * To clear selection, set invalidSelectionPosition() as the \a position.
+ * To clear selection, set invalidSelectionPosition as the \a position.
  * If this series is added to a graph, the graph can adjust the selection according to user
  * interaction or if it becomes invalid. Selecting a bar on another added series will also
  * clear the selection.
  */
 
 /*!
- * \qmlmethod point Bar3DSeries::invalidSelectionPosition()
- * \return an invalid position for selection. Set this position to selectedBar property if you
- * want to clear the selection.
+ * \qmlproperty point Bar3DSeries::invalidSelectionPosition
+ * A constant property providing an invalid position for selection. Set this position to
+ * selectedBar property if you want to clear the selection.
  */
 
 /*!
@@ -185,7 +185,7 @@ QPoint QBar3DSeries::selectedBar() const
  * \return an invalid position for selection. Set this position to selectedBar property if you
  * want to clear the selection.
  */
-QPoint QBar3DSeries::invalidSelectionPosition() const
+QPoint QBar3DSeries::invalidSelectionPosition()
 {
     return Bars3DController::invalidSelectionPosition();
 }
diff --git a/src/datavisualization/data/qbar3dseries.h b/src/datavisualization/data/qbar3dseries.h
index 5883cbfb..d4e948ad 100644
--- a/src/datavisualization/data/qbar3dseries.h
+++ b/src/datavisualization/data/qbar3dseries.h
@@ -43,7 +43,7 @@ public:
 
     void setSelectedBar(const QPoint &position);
     QPoint selectedBar() const;
-    QPoint invalidSelectionPosition() const;
+    static QPoint invalidSelectionPosition();
 
 signals:
     void dataProxyChanged(QBarDataProxy *proxy);
diff --git a/src/datavisualization/data/qscatter3dseries.cpp b/src/datavisualization/data/qscatter3dseries.cpp
index 0e7ce921..5aa17ed3 100644
--- a/src/datavisualization/data/qscatter3dseries.cpp
+++ b/src/datavisualization/data/qscatter3dseries.cpp
@@ -88,7 +88,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  *
  * Selects an item at the \a index. The \a index is the index in the data array of the series.
  * Only one item can be selected at a time.
- * To clear selection, set invalidSelectionIndex() as the \a index.
+ * To clear selection, set invalidSelectionIndex as the \a index.
  * If this series is added to a graph, the graph can adjust the selection according to user
  * interaction or if it becomes invalid. Selecting an item on another added series will also
  * clear the selection.
@@ -103,9 +103,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  */
 
 /*!
- * \qmlmethod int Scatter3DSeries::invalidSelectionIndex()
- * \return an invalid index for selection. Set this index to selectedItem property if you
- * want to clear the selection.
+ * \qmlproperty int Scatter3DSeries::invalidSelectionIndex
+ * A constant property providing an invalid index for selection. Set this index to
+ * selectedItem property if you want to clear the selection.
  */
 
 /*!
@@ -209,7 +209,7 @@ float QScatter3DSeries::itemSize() const
  * \return an invalid index for selection. Set this index to selectedItem property if you
  * want to clear the selection.
  */
-int QScatter3DSeries::invalidSelectionIndex() const
+int QScatter3DSeries::invalidSelectionIndex()
 {
     return Scatter3DController::invalidSelectionIndex();
 }
diff --git a/src/datavisualization/data/qscatter3dseries.h b/src/datavisualization/data/qscatter3dseries.h
index 1d9abc11..758277c0 100644
--- a/src/datavisualization/data/qscatter3dseries.h
+++ b/src/datavisualization/data/qscatter3dseries.h
@@ -43,12 +43,11 @@ public:
 
     void setSelectedItem(int index);
     int selectedItem() const;
+    static int invalidSelectionIndex();
 
     void setItemSize(float size);
     float itemSize() const;
 
-    Q_INVOKABLE int invalidSelectionIndex() const;
-
 signals:
     void dataProxyChanged(QScatterDataProxy *proxy);
     void selectedItemChanged(int index);
diff --git a/src/datavisualization/data/qsurface3dseries.cpp b/src/datavisualization/data/qsurface3dseries.cpp
index da285b2d..25405959 100644
--- a/src/datavisualization/data/qsurface3dseries.cpp
+++ b/src/datavisualization/data/qsurface3dseries.cpp
@@ -92,15 +92,15 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  * Selects a surface grid point in a \a position. The position is the (row, column) position in
  * the data array of the series.
  * Only one point can be selected at a time.
- * To clear selection, set invalidSelectionPosition() as the \a position.
+ * To clear selection, set invalidSelectionPosition as the \a position.
  * If this series is added to a graph, the graph can adjust the selection according to user
  * interaction or if it becomes invalid.
  */
 
 /*!
- * \qmlmethod point Surface3DSeries::invalidSelectionPosition()
- * \return a point signifying an invalid selection position. Set this to selectedPoint property
- * to clear the selection.
+ * \qmlproperty point Surface3DSeries::invalidSelectionPosition
+ * A constant property providing an invalid selection position.
+ * Set this to selectedPoint property to clear the selection.
  */
 
 /*!
@@ -221,7 +221,7 @@ QPoint QSurface3DSeries::selectedPoint() const
  * \return a QPoint signifying an invalid selection position. Set this to selectedPoint property
  * to clear the selection.
  */
-QPoint QSurface3DSeries::invalidSelectionPosition() const
+QPoint QSurface3DSeries::invalidSelectionPosition()
 {
     return Surface3DController::invalidSelectionPosition();
 }
diff --git a/src/datavisualization/data/qsurface3dseries.h b/src/datavisualization/data/qsurface3dseries.h
index 6681495b..0ddd53da 100644
--- a/src/datavisualization/data/qsurface3dseries.h
+++ b/src/datavisualization/data/qsurface3dseries.h
@@ -53,7 +53,7 @@ public:
 
     void setSelectedPoint(const QPoint &position);
     QPoint selectedPoint() const;
-    QPoint invalidSelectionPosition() const;
+    static QPoint invalidSelectionPosition();
 
     void setFlatShadingEnabled(bool enabled);
     bool isFlatShadingEnabled() const;
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));
 
diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index 91083eb9..9c24844f 100644
--- a/src/datavisualization/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -158,7 +158,7 @@ protected:
 
     QList<QAbstract3DSeries *> m_seriesList;
 
-    explicit Abstract3DController(QRect initialViewport, QObject *parent = 0);
+    explicit Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent = 0);
 
 public:
     virtual ~Abstract3DController();
diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index 3efd890b..c765a37a 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -32,8 +32,8 @@
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
-Bars3DController::Bars3DController(QRect boundRect)
-    : Abstract3DController(boundRect),
+Bars3DController::Bars3DController(QRect boundRect, Q3DScene *scene)
+    : Abstract3DController(boundRect, scene),
       m_selectedBar(invalidSelectionPosition()),
       m_selectedBarSeries(0),
       m_isBarSpecRelative(true),
diff --git a/src/datavisualization/engine/bars3dcontroller_p.h b/src/datavisualization/engine/bars3dcontroller_p.h
index 46fc991d..3fcae959 100644
--- a/src/datavisualization/engine/bars3dcontroller_p.h
+++ b/src/datavisualization/engine/bars3dcontroller_p.h
@@ -73,7 +73,7 @@ private:
     Bars3DRenderer *m_renderer;
 
 public:
-    explicit Bars3DController(QRect rect);
+    explicit Bars3DController(QRect rect, Q3DScene *scene = 0);
     ~Bars3DController();
 
     virtual void initializeOpenGL();
diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp
index d8104b3a..ce037b55 100644
--- a/src/datavisualization/engine/q3dscene.cpp
+++ b/src/datavisualization/engine/q3dscene.cpp
@@ -90,9 +90,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  * \qmlproperty point Scene3D::selectionQueryPosition
  *
  * This property contains the coordinates for the user input that should be processed
- * by the scene as selection. If this is set to value other than \c{(-1, -1)} the
+ * by the scene as selection. If this is set to value other than invalidSelectionPoint the
  * graph tries to select a data item at the given point within the primary viewport.
- * After the rendering pass the property is returned to its default state of \c{(-1, -1)}.
+ * After the rendering pass the property is returned to its default state of invalidSelectionPoint.
  */
 
 /*!
@@ -131,6 +131,12 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  */
 
 /*!
+ * \qmlproperty point Scene3D::invalidSelectionPoint
+ * A constant property providing an invalid point for selection.
+ */
+
+
+/*!
  * Constructs a basic scene with one light and one camera in it. An
  * optional \a parent parameter can be given and is then passed to QObject constructor.
  */
@@ -272,7 +278,7 @@ QPoint Q3DScene::selectionQueryPosition() const
 /*!
  * \return a QPoint signifying an invalid selection position.
  */
-const QPoint Q3DScene::invalidSelectionPoint()
+QPoint Q3DScene::invalidSelectionPoint()
 {
     static const QPoint invalidSelectionPos(-1, -1);
     return invalidSelectionPos;
diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h
index 27e09ab0..f57d3351 100644
--- a/src/datavisualization/engine/q3dscene.h
+++ b/src/datavisualization/engine/q3dscene.h
@@ -59,7 +59,7 @@ public:
 
     void setSelectionQueryPosition(const QPoint &point);
     QPoint selectionQueryPosition() const;
-    static const QPoint invalidSelectionPoint();
+    static QPoint invalidSelectionPoint();
 
     void setSlicingActive(bool isSlicing);
     bool isSlicingActive() const;
diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp
index 61a95e88..58706705 100644
--- a/src/datavisualization/engine/scatter3dcontroller.cpp
+++ b/src/datavisualization/engine/scatter3dcontroller.cpp
@@ -29,8 +29,8 @@
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
-Scatter3DController::Scatter3DController(QRect boundRect)
-    : Abstract3DController(boundRect),
+Scatter3DController::Scatter3DController(QRect boundRect, Q3DScene *scene)
+    : Abstract3DController(boundRect, scene),
       m_renderer(0),
       m_selectedItem(invalidSelectionIndex()),
       m_selectedItemSeries(0)
diff --git a/src/datavisualization/engine/scatter3dcontroller_p.h b/src/datavisualization/engine/scatter3dcontroller_p.h
index 397d47a4..d484454d 100644
--- a/src/datavisualization/engine/scatter3dcontroller_p.h
+++ b/src/datavisualization/engine/scatter3dcontroller_p.h
@@ -63,7 +63,7 @@ private:
                                             // in single series selection cases.
 
 public:
-    explicit Scatter3DController(QRect rect);
+    explicit Scatter3DController(QRect rect, Q3DScene *scene = 0);
     ~Scatter3DController();
 
     virtual void initializeOpenGL();
diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index 6082e105..7c7b7a90 100644
--- a/src/datavisualization/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -32,8 +32,8 @@
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
-Surface3DController::Surface3DController(QRect rect)
-    : Abstract3DController(rect),
+Surface3DController::Surface3DController(QRect rect, Q3DScene *scene)
+    : Abstract3DController(rect, scene),
       m_renderer(0),
       m_selectedPoint(invalidSelectionPosition()),
       m_selectedSeries(0),
diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h
index 54d709b4..915a3122 100644
--- a/src/datavisualization/engine/surface3dcontroller_p.h
+++ b/src/datavisualization/engine/surface3dcontroller_p.h
@@ -70,7 +70,7 @@ private:
     QVector<int> m_changedRows;
 
 public:
-    explicit Surface3DController(QRect rect);
+    explicit Surface3DController(QRect rect, Q3DScene *scene = 0);
     ~Surface3DController();
 
     virtual void initializeOpenGL();