diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 15:27:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 15:27:30 (GMT) |
| commit | 9c2522f2e28c2f22b24500b51ed37590666c1f84 (patch) | |
| tree | af3f73b8d1132c6b80e8a40604c49a1866b1afa5 /src/gui/painting | |
| parent | ac19a3409253f5f74984624b99268212ba74c086 (diff) | |
| parent | 8f830a429b4dfa56889dda8ec77f67281ca4c4ac (diff) | |
| download | Qt-9c2522f2e28c2f22b24500b51ed37590666c1f84.zip Qt-9c2522f2e28c2f22b24500b51ed37590666c1f84.tar.gz Qt-9c2522f2e28c2f22b24500b51ed37590666c1f84.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Add support for Qt::WA_TranslucentBackground with OpenVG on Symbian^3
Crash fix when using the runtime graphics system on Symbian.
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qwindowsurface_s60.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp index d4dcf7d..eb9eff2 100644 --- a/src/gui/painting/qwindowsurface_s60.cpp +++ b/src/gui/painting/qwindowsurface_s60.cpp @@ -102,9 +102,11 @@ QS60WindowSurface::~QS60WindowSurface() // Issue empty redraw to clear the UI surface QWidget *w = window(); - RWindow *const window = static_cast<RWindow *>(w->winId()->DrawableWindow()); - window->BeginRedraw(); - window->EndRedraw(); + if (w->testAttribute(Qt::WA_WState_Created)) { + RWindow *const window = static_cast<RWindow *>(w->winId()->DrawableWindow()); + window->BeginRedraw(); + window->EndRedraw(); + } } } #endif |