diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-02 16:05:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-02 16:05:08 (GMT) |
| commit | 20531a5d26113837cd48ecc52a70ae62fdd97606 (patch) | |
| tree | eb46ee10d2481d2c3576e014e0fd03d8140e9437 /src/opengl | |
| parent | 8abaeb826c5fdb5bb872b27b3f411e63d63a12ff (diff) | |
| parent | c97917179c633fecd7c92180482ace941829ba49 (diff) | |
| download | Qt-20531a5d26113837cd48ecc52a70ae62fdd97606.zip Qt-20531a5d26113837cd48ecc52a70ae62fdd97606.tar.gz Qt-20531a5d26113837cd48ecc52a70ae62fdd97606.tar.bz2 | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 56e2c3b..8494283 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -610,6 +610,17 @@ void QGLWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoint & if (!d_ptr->destructive_swap_buffers && !d_ptr->did_paint) return; +#ifdef Q_OS_SYMBIAN + if (window() != widget) { + // For performance reasons we don't support + // flushing native child widgets on Symbian. + // It breaks overlapping native child widget + // rendering in some cases but we prefer performance. + return; + } +#endif + + QWidget *parent = widget->internalWinId() ? widget : widget->nativeParentWidget(); Q_ASSERT(parent); |