From be62ece6c1ae8cbe19f1a445f82e55782fd22129 Mon Sep 17 00:00:00 2001
From: Morten Sorvig <morten.sorvig@nokia.com>
Date: Mon, 29 Aug 2011 11:59:07 +0200
Subject: [PATCH] Compile without QT_DEBUG.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/gui/opengl/qopenglframebufferobject.cpp | 2 +-
 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