diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-28 07:40:30 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-28 07:40:30 (GMT) |
| commit | 427c35771a83cce39f5f48c188c180d35ef6ecc9 (patch) | |
| tree | 31164c83e5cf610cee9c505e857141866995664d /src/opengl | |
| parent | 7a35cb66f1ca6e90655ece3c726f8d2c01c68b53 (diff) | |
| parent | f65e60b49395d68be78259ec82c9969b267e591c (diff) | |
| download | Qt-427c35771a83cce39f5f48c188c180d35ef6ecc9.zip Qt-427c35771a83cce39f5f48c188c180d35ef6ecc9.tar.gz Qt-427c35771a83cce39f5f48c188c180d35ef6ecc9.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl.cpp | 4 | ||||
| -rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index b8fa133..18d9125 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -2452,6 +2452,10 @@ bool QGLContext::create(const QGLContext* shareContext) return false; reset(); d->valid = chooseContext(shareContext); + if (d->valid && d->paintDevice->devType() == QInternal::Widget) { + QWidgetPrivate *wd = qt_widget_private(static_cast<QWidget *>(d->paintDevice)); + wd->usesDoubleBufferedGLContext = d->glFormat.doubleBuffer(); + } if (d->sharing) // ok, we managed to share qgl_share_reg()->addShare(this, shareContext); return d->valid; diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 837ccf2..b41adf9 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE // QGLGraphicsSystem // #ifdef Q_WS_WIN -Q_GUI_EXPORT bool qt_win_owndc_required; +extern Q_GUI_EXPORT bool qt_win_owndc_required; #endif QGLGraphicsSystem::QGLGraphicsSystem() : QGraphicsSystem() |