diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-09-09 01:58:52 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-09-09 01:58:52 (GMT) |
| commit | 87b8fe63d4832d7467719f462dea8fd459595480 (patch) | |
| tree | f1f66321f69ee4a72c3aa730215a20d84f475e2e /src/opengl/qgl_x11.cpp | |
| parent | c253b86a77e8228479fec21c7237a54103ab95ee (diff) | |
| parent | d9fadadd4f78a5be9deca1da26be7d86f4da338c (diff) | |
| download | Qt-87b8fe63d4832d7467719f462dea8fd459595480.zip Qt-87b8fe63d4832d7467719f462dea8fd459595480.tar.gz Qt-87b8fe63d4832d7467719f462dea8fd459595480.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/opengl/qgl_x11.cpp')
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index 81985cd..a7376b2 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1308,7 +1308,6 @@ void QGLWidget::setContext(QGLContext *context, QGLContext* oldcx = d->glcx; d->glcx = context; - if (parentWidget()) { // force creation of delay-created widgets parentWidget()->winId(); |