Merge remote-tracking branch 'origin/develop'

Change-Id: I0b7f2e272565bd1b581b1de8835a73b806d1eb73

5 files changed, 22 insertions, 6 deletions

diff --git a/README b/README
index 7d854ede..18df6e6a 100644
--- a/README
+++ b/README
@@ -32,7 +32,7 @@ For debug builds:
     qmake CONFIG+=debug_and_release; make debug
 
 For release builds:
-    qmake CONFIG+=release ; make
+    qmake CONFIG+=release; make
     or
     qmake CONFIG+=debug_and_release; make release
 
diff --git a/examples/bars/graphmodifier.cpp b/examples/bars/graphmodifier.cpp
index 0b33bde0..e2ace423 100644
--- a/examples/bars/graphmodifier.cpp
+++ b/examples/bars/graphmodifier.cpp
@@ -78,6 +78,7 @@ GraphModifier::GraphModifier(Q3DBars *bargraph)
     m_graph->addDataProxy(m_temperatureData);
     //! [4]
 
+    changePresetCamera();
     resetTemperatureData();
 }
 //! [0]
@@ -141,7 +142,7 @@ void GraphModifier::changeStyle(int style)
 
 void GraphModifier::changePresetCamera()
 {
-    static int preset = QDataVis::CameraPresetFrontLow;
+    static int preset = QDataVis::CameraPresetFront;
 
     m_graph->scene()->activeCamera()->setCameraPreset((QDataVis::CameraPreset)preset);
 
diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc
index 5ec60061..02c303d6 100644
--- a/src/datavisualization/doc/src/qtdatavisualization.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc
@@ -93,7 +93,7 @@
 
     For release builds:
     \code
-    qmake CONFIG+=release ; make
+    qmake CONFIG+=release; make
     \endcode
     or
     \code
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index a989ed3f..63bd93a7 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -117,6 +117,8 @@ Surface3DRenderer::Surface3DRenderer(Surface3DController *controller)
     if (!tester.testCompile()) {
         m_flatSupported = false;
         m_controller->setSmoothSurface(true);
+        qWarning() << "Warning: Flat qualifier not supported on your platform's GLSL language."
+                      " Requires at least GLSL version 1.2 with GL_EXT_gpu_shader4 extension.";
     }
 
     m_cachedSmoothSurface =  m_controller->smoothSurface();
diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp
index 7df1736c..e27103af 100644
--- a/src/datavisualization/utils/shaderhelper.cpp
+++ b/src/datavisualization/utils/shaderhelper.cpp
@@ -22,6 +22,14 @@
 
 QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 
+void discardDebugMsgs(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+{
+    Q_UNUSED(type)
+    Q_UNUSED(context)
+    Q_UNUSED(msg)
+    // Used to discard warnings generated during shader test compilation
+}
+
 ShaderHelper::ShaderHelper(QObject *parent,
                            const QString &vertexShader,
                            const QString &fragmentShader,
@@ -88,14 +96,19 @@ void ShaderHelper::initialize()
 
 bool ShaderHelper::testCompile()
 {
+    bool result = true;
+    // Discard warnings, we only need the result
+    QtMessageHandler handler = qInstallMessageHandler(discardDebugMsgs);
     if (m_program)
         delete m_program;
     m_program = new QOpenGLShaderProgram(m_caller);
     if (!m_program->addShaderFromSourceFile(QOpenGLShader::Vertex, m_vertexShaderFile))
-        return false;
+        result = false;
     if (!m_program->addShaderFromSourceFile(QOpenGLShader::Fragment, m_fragmentShaderFile))
-        return false;
-    return true;
+        result = false;
+    // Restore actual message handler
+    qInstallMessageHandler(handler);
+    return result;
 }
 
 void ShaderHelper::bind()