summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-03-17 17:55:01 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2011-03-17 17:55:54 (GMT)
commit42aa4968f6badb8940f5eee6f662ba649c7b4790 (patch)
tree0e2b0140c601d824760ba0e5d2554661c96c6a6e
parentce33fe15dde2151905839196da9927f4c19b18be (diff)
downloadQt-42aa4968f6badb8940f5eee6f662ba649c7b4790.zip
Qt-42aa4968f6badb8940f5eee6f662ba649c7b4790.tar.gz
Qt-42aa4968f6badb8940f5eee6f662ba649c7b4790.tar.bz2
Fixed compilation of QtOpenGL with Q_WS_QPA.
-rw-r--r--src/opengl/qwindowsurface_gl.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp
index 93e720c..f5edce8 100644
--- a/src/opengl/qwindowsurface_gl.cpp
+++ b/src/opengl/qwindowsurface_gl.cpp
@@ -405,10 +405,12 @@ QGLWindowSurface::~QGLWindowSurface()
delete d_ptr->fbo;
delete d_ptr;
+#ifndef Q_WS_QPA
if (QGLGlobalShareWidget::cleanedUp)
return;
--(_qt_gl_share_widget()->widgetRefCount);
+#endif
#ifdef QGL_USE_TEXTURE_POOL
if (_qt_gl_share_widget()->widgetRefCount <= 0) {
@@ -474,8 +476,10 @@ void QGLWindowSurface::hijackWindow(QWidget *widget)
ctx->create(qt_gl_share_context());
+#ifndef Q_WS_QPA
if (widget != qt_gl_share_widget())
++(_qt_gl_share_widget()->widgetRefCount);
+#endif
#ifndef QT_NO_EGL
static bool checkedForNOKSwapRegion = false;