From ef090b54d778f96658d291c7a522e37b5fab611f Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 21 Dec 2016 13:46:27 +0100 Subject: Suppress QOpenGLShaderProgram::link() warnings for binaries No need to pollute the debug output when attempting to load a program binary which then gets rejected, because this is not fatal. We will simply recompile from source then. Change-Id: I762b7c66fc1ccdf8ab73d720ee10a349c287628b Reviewed-by: Friedemann Kleint Reviewed-by: Andy Nichols --- src/gui/opengl/qopenglshaderprogram.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/opengl/qopenglshaderprogram.cpp') diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp index d296f327c89..c9552fd321e 100644 --- a/src/gui/opengl/qopenglshaderprogram.cpp +++ b/src/gui/opengl/qopenglshaderprogram.cpp @@ -1310,7 +1310,7 @@ bool QOpenGLShaderProgram::link() GLint len; d->glfuncs->glGetProgramInfoLog(program, value, &len, logbuf); d->log = QString::fromLatin1(logbuf); - if (!d->linked) { + if (!d->linked && !d->linkBinaryRecursion) { QString name = objectName(); if (name.isEmpty()) qWarning("QOpenGLShader::link: %ls", qUtf16Printable(d->log)); -- cgit v1.2.3