diff options
| author | Samuel Rødal <[email protected]> | 2013-05-24 09:19:12 +0200 |
|---|---|---|
| committer | The Qt Project <[email protected]> | 2013-05-24 11:53:09 +0200 |
| commit | 9ae5162b3c972a2cedba4f817235aaf96e7dfd7e (patch) | |
| tree | d2e007e2fa71af4cccb365d6437fae40c497487e /src/opengl/qglshaderprogram.cpp | |
| parent | 6359f42064cdd9733ac54c3931156fd37448838e (diff) | |
Prevent QOpenGLShaderProgram::link() from showing unnecessary warnings.
If the liking didn't fail there's no need to print out warnings. The
warnings can still be accessed by the application after calling link()
through the log() function.
This prevents warnings such as these from appearing:
QOpenGLShader::link: "No errors."
Task-number: QTBUG-31326
Change-Id: I03c9be5dfada8822c3ab1c3610eac2fc0a91410b
Reviewed-by: Gunnar Sletta <[email protected]>
Reviewed-by: Sean Harmer <[email protected]>
Diffstat (limited to 'src/opengl/qglshaderprogram.cpp')
| -rw-r--r-- | src/opengl/qglshaderprogram.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index 4859df21d60..e7b7ad13484 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -957,10 +957,12 @@ bool QGLShaderProgram::link() d->glfuncs->glGetProgramInfoLog(program, value, &len, logbuf); d->log = QString::fromLatin1(logbuf); QString name = objectName(); - if (name.isEmpty()) - qWarning() << "QGLShader::link:" << d->log; - else - qWarning() << "QGLShader::link[" << name << "]:" << d->log; + if (!d->linked) { + if (name.isEmpty()) + qWarning() << "QGLShader::link:" << d->log; + else + qWarning() << "QGLShader::link[" << name << "]:" << d->log; + } delete [] logbuf; } return d->linked; |