diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-12-21 13:46:27 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-12-21 16:16:05 +0000 |
| commit | ef090b54d778f96658d291c7a522e37b5fab611f (patch) | |
| tree | e07eebdf6e987d8d4c5dba3f050d770bc5d70962 /src | |
| parent | 079aa711ecbd370805a1e23bdc6a7f396f157868 (diff) | |
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 <Friedemann.Kleint@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/opengl/qopenglshaderprogram.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp index d296f327c8..c9552fd321 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)); |