1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile

Browse Source 
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>
This commit is contained in:
BogDan Vatra 2014-03-05 10:12:39 +02:00 committed by The Qt Project
parent 1f695a31e2
commit c5b2425e8e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/opengl/qgl.cpp
View File

@ -2517,14 +2517,13 @@ QGLTexture *QGLContextPrivate::bindTexture(const QPixmap &pixmap, GLenum target,
/*! \internal */ /*! \internal */
int QGLContextPrivate::maxTextureSize() int QGLContextPrivate::maxTextureSize()
{ {
Q_Q(QGLContext);
if (max_texture_size != -1) if (max_texture_size != -1)
return max_texture_size; return max_texture_size;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size); glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
#ifndef QT_OPENGL_ES #ifndef QT_OPENGL_ES
Q_Q(QGLContext);
if (!q->contextHandle()->isES()) { if (!q->contextHandle()->isES()) {
GLenum proxy = GL_PROXY_TEXTURE_2D; GLenum proxy = GL_PROXY_TEXTURE_2D;