summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kde.org>2014-03-05 10:12:39 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-06 06:09:17 +0100
commitc5b2425e8ea1aa25d7ce4253f0205c989bf7a345 (patch)
tree2a76dfa61f2b99fea3df3e0f2efbd676df9aa275 /src/opengl
parent1f695a31e2e3df1782e2ee5565ff9e7bfd8dd9ae (diff)
Fix compile
Move Q_Q(QGLContext); inside #ifndef block, otherwise q varialble remains unused and it breaks the compilation. Change-Id: Iebef9a45930fd4f7783eb983b55bf6b5e0b94cf4 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/qgl.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 1bdc9b84e0..1fbff0f0fe 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -2517,14 +2517,13 @@ QGLTexture *QGLContextPrivate::bindTexture(const QPixmap &pixmap, GLenum target,
/*! \internal */
int QGLContextPrivate::maxTextureSize()
{
- Q_Q(QGLContext);
-
if (max_texture_size != -1)
return max_texture_size;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
#ifndef QT_OPENGL_ES
+ Q_Q(QGLContext);
if (!q->contextHandle()->isES()) {
GLenum proxy = GL_PROXY_TEXTURE_2D;