diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-30 16:08:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-30 16:08:44 (GMT) |
| commit | b36a6fc2961fabf1a2236f580f00384b88076c7c (patch) | |
| tree | 0d33a9fee96be75aaf293ca9922369d34d433f08 /src | |
| parent | bff7af0b3dbf0fd57848e6655206fe8041abf478 (diff) | |
| parent | 9e26955ab926afe1bc3306d5f6fcab0c5dfe4db1 (diff) | |
| download | Qt-b36a6fc2961fabf1a2236f580f00384b88076c7c.zip Qt-b36a6fc2961fabf1a2236f580f00384b88076c7c.tar.gz Qt-b36a6fc2961fabf1a2236f580f00384b88076c7c.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 0c4b307..7f157a1 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -1071,6 +1071,14 @@ void QSymbianControl::Draw(const TRect& controlRect) const Q_ASSERT(topExtra); if (!topExtra->inExpose) { topExtra->inExpose = true; + if (!qwidget->isWindow()) { + // If we get here, then it means we have a native child window + // Since no content should ever be painted to these windows, we + // erase them with a transparent brush when they get an expose. + CWindowGc &gc = SystemGc(); + gc.SetBrushColor(TRgb(0, 0, 0, 0)); + gc.Clear(controlRect); + } QRect exposeRect = qt_TRect2QRect(controlRect); qwidget->d_func()->syncBackingStore(exposeRect); topExtra->inExpose = false; |