Compilation error fix

+ compilation warning fixes

Change-Id: Ib4f98f496733fd72ddf4a5da9ce4e379b84fa1ba
Change-Id: Ib4f98f496733fd72ddf4a5da9ce4e379b84fa1ba
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

3 files changed, 5 insertions, 6 deletions

diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp
index 51973e02..571af1d7 100644
--- a/src/datavisualization/engine/q3dcamera.cpp
+++ b/src/datavisualization/engine/q3dcamera.cpp
@@ -582,7 +582,7 @@ void Q3DCamera::setWrapYRotation(bool isEnabled)
  */
 void Q3DCamera::setCameraPosition(qreal horizontal, qreal vertical, qreal zoom)
 {
-    setZoomLevel(qBound(10.0, distance, 500.0));
+    setZoomLevel(qBound(10.0, zoom, 500.0));
     setXRotation(horizontal);
     setYRotation(vertical);
 }
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index 559679ab..fdefe7f0 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -109,9 +109,9 @@ Surface3DRenderer::Surface3DRenderer(Surface3DController *controller)
       m_yFlipped(false),
       m_sampleSpace(QRect(0, 0, 0, 0)),
       m_shadowQualityMultiplier(3),
-      m_hasHeightAdjustmentChanged(true),
       m_cachedSelectionId(0),
-      m_selectionModeChanged(false)
+      m_selectionModeChanged(false),
+      m_hasHeightAdjustmentChanged(true)
 {
 #if !defined(QT_OPENGL_ES_2)
     // Check if flat feature is supported
@@ -488,8 +488,8 @@ void Surface3DRenderer::drawSlicedScene()
 
     QMatrix4x4 projectionViewMatrix = projectionMatrix * viewMatrix;
 
-    GLfloat scaleX;
-    GLfloat scaleXBackground;
+    GLfloat scaleX = 0.0f;
+    GLfloat scaleXBackground = 0.0f;
     GLfloat offset = 0.0f;
     if (m_cachedSelectionMode == QDataVis::SelectionModeSliceRow) {
         scaleX = m_surfaceScaleX;
diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h
index e5a76aac..e42e820a 100644
--- a/src/datavisualization/engine/surface3drenderer_p.h
+++ b/src/datavisualization/engine/surface3drenderer_p.h
@@ -126,7 +126,6 @@ private:
     QSizeF m_areaSize;
     uint m_cachedSelectionId;
     bool m_selectionModeChanged;
-
     bool m_hasHeightAdjustmentChanged;
 
 public: