diff options
author | Morten Sorvig <morten.sorvig@nokia.com> | 2011-08-29 11:59:07 +0200 |
---|---|---|
committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-29 12:05:38 +0200 |
commit | be62ece6c1ae8cbe19f1a445f82e55782fd22129 (patch) | |
tree | 499a8b8fe9bd984d837afa3806c539cb3e8f847e /src/gui/opengl | |
parent | b5dba292c2439488985be0d0c38613a50563a995 (diff) |
Compile without QT_DEBUG.
Change-Id: I3dadcdd83f45451d712703601d46adbc1691291b
Reviewed-on: http://codereview.qt.nokia.com/3727
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/opengl')
-rw-r--r-- | src/gui/opengl/qopenglframebufferobject.cpp | 2 | ||||
-rw-r--r-- | src/gui/opengl/qopenglshaderprogram.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp index 643dc67bb7..3d236eaac6 100644 --- a/src/gui/opengl/qopenglframebufferobject.cpp +++ b/src/gui/opengl/qopenglframebufferobject.cpp @@ -964,8 +964,8 @@ bool QOpenGLFramebufferObject::release() if (!current) return false; -#ifdef QT_DEBUG Q_D(QOpenGLFramebufferObject); +#ifdef QT_DEBUG if (current->shareGroup() != d->fbo_guard->group()) qWarning("QOpenGLFramebufferObject::release() called from incompatible context"); #endif diff --git a/src/gui/opengl/qopenglshaderprogram.cpp b/src/gui/opengl/qopenglshaderprogram.cpp index 26ffe2b748..e8baf11db8 100644 --- a/src/gui/opengl/qopenglshaderprogram.cpp +++ b/src/gui/opengl/qopenglshaderprogram.cpp @@ -892,8 +892,8 @@ bool QOpenGLShaderProgram::bind() */ void QOpenGLShaderProgram::release() { -#ifndef QT_NO_DEBUG Q_D(QOpenGLShaderProgram); +#ifndef QT_NO_DEBUG if (d->programGuard->group() != QOpenGLContextGroup::currentContextGroup()) qWarning("QOpenGLShaderProgram::release: program is not valid in the current context."); #endif |