summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qwindowsurface_s60.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-12 14:08:48 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-12 14:08:48 (GMT)
commit8f830a429b4dfa56889dda8ec77f67281ca4c4ac (patch)
treeb5ba66b3c46e6d4d97c964683103f38d0d865c14 /src/gui/painting/qwindowsurface_s60.cpp
parent2d23ed056fcc5276d322e3ac057baff4c3449406 (diff)
parentb05b53cd90ef6dcbf6395ba991e0f848415136aa (diff)
downloadQt-8f830a429b4dfa56889dda8ec77f67281ca4c4ac.zip
Qt-8f830a429b4dfa56889dda8ec77f67281ca4c4ac.tar.gz
Qt-8f830a429b4dfa56889dda8ec77f67281ca4c4ac.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/painting/qwindowsurface_s60.cpp')
-rw-r--r--src/gui/painting/qwindowsurface_s60.cpp8
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