diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2010-02-09 15:45:29 (GMT) |
|---|---|---|
| committer | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2010-02-09 15:45:29 (GMT) |
| commit | a49a2ae399643afd30dd5d2df90ecb6d6325121a (patch) | |
| tree | 5ac7bbece7c7ff90f9796430e4eaaff7728dfe29 /src/opengl | |
| parent | dadfdfaa320aa5951d8512428d59e762b0da79f3 (diff) | |
| parent | 392123ef5432643d1047d1e1dd71512ec39d382d (diff) | |
| download | Qt-a49a2ae399643afd30dd5d2df90ecb6d6325121a.zip Qt-a49a2ae399643afd30dd5d2df90ecb6d6325121a.tar.gz Qt-a49a2ae399643afd30dd5d2df90ecb6d6325121a.tar.bz2 | |
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl_mac.mm | 2 | ||||
| -rw-r--r-- | src/opengl/qgl_p.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/qgl_mac.mm b/src/opengl/qgl_mac.mm index c01575b..4d7532e 100644 --- a/src/opengl/qgl_mac.mm +++ b/src/opengl/qgl_mac.mm @@ -951,8 +951,6 @@ void QGLWidgetPrivate::init(QGLContext *context, const QGLWidget *shareWidget) break; current = current->parentWidget(); } - - isGLWidget = 1; } bool QGLWidgetPrivate::renderCxPm(QPixmap*) diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 713b067..da0887e 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -179,7 +179,9 @@ public: #if defined(Q_WS_X11) && defined(QT_OPENGL_ES) , eglSurfaceWindowId(0) #endif - {} + { + isGLWidget = 1; + } ~QGLWidgetPrivate() {} |