summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-12-02 12:59:46 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-12-03 10:17:58 +0200
commit9549c09d4cfee485c31f54360a32d100d06a2095 (patch)
tree59e2d31fc305dd37f22d216a3809313228869253 /src/datavisualization/utils
parent1aafc43b5646eae86a53a7121aa29e0096b5fde8 (diff)
Move series specific visual elements to series, part 2
Surface series grid visibility and smoothness Task-number: QTRD-2557 Change-Id: I0beecb7785bf2fb489d0faba797a145151513a79 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/utils')
-rw-r--r--src/datavisualization/utils/shaderhelper.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp
index 7eb48945..b4d2ee76 100644
--- a/src/datavisualization/utils/shaderhelper.cpp
+++ b/src/datavisualization/utils/shaderhelper.cpp
@@ -98,15 +98,17 @@ 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);
+ m_program = new QOpenGLShaderProgram();
if (!m_program->addShaderFromSourceFile(QOpenGLShader::Vertex, m_vertexShaderFile))
result = false;
if (!m_program->addShaderFromSourceFile(QOpenGLShader::Fragment, m_fragmentShaderFile))
result = false;
+
// Restore actual message handler
qInstallMessageHandler(handler);
return result;