Merge remote-tracking branch 'origin/develop'

Change-Id: I08bea50003ca959667ecea65803744c31cd3b159

1 files changed, 14 insertions, 1 deletions

diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index a6dee6eb..f7ccbf21 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -308,7 +308,7 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller)
     QObject::connect(m_controller.data(), &Abstract3DController::selectionModeChanged, this,
                      &AbstractDeclarative::handleSelectionModeChange);
     QObject::connect(m_controller.data(), &Abstract3DController::elementSelected, this,
-                     &AbstractDeclarative::selectedElementChanged);
+                     &AbstractDeclarative::handleSelectedElementChange);
 
     QObject::connect(m_controller.data(), &Abstract3DController::axisXChanged, this,
                      &AbstractDeclarative::handleAxisXChanged);
@@ -327,6 +327,8 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller)
 
     QObject::connect(m_controller.data(), &Abstract3DController::aspectRatioChanged, this,
                      &AbstractDeclarative::aspectRatioChanged);
+    QObject::connect(m_controller.data(), &Abstract3DController::optimizationHintsChanged, this,
+                     &AbstractDeclarative::handleOptimizationHintChange);
 }
 
 void AbstractDeclarative::activateOpenGLContext(QQuickWindow *window)
@@ -532,6 +534,17 @@ void AbstractDeclarative::handleShadowQualityChange(QAbstract3DGraph::ShadowQual
     emit shadowQualityChanged(ShadowQuality(quality));
 }
 
+void AbstractDeclarative::handleSelectedElementChange(QAbstract3DGraph::ElementType type)
+{
+    emit selectedElementChanged(ElementType(type));
+}
+
+void AbstractDeclarative::handleOptimizationHintChange(QAbstract3DGraph::OptimizationHints hints)
+{
+    int intHints = int(hints);
+    emit optimizationHintsChanged(OptimizationHints(intHints));
+}
+
 void AbstractDeclarative::render()
 {
     updateWindowParameters();