diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 06:17:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 06:17:00 (GMT) |
| commit | 162bc6d94fadbfc9216d45eede4dc6d4fc2d5eef (patch) | |
| tree | cb81484453840510072445c656ba2cc242e2206d | |
| parent | 5437ff48a0706b75aa4c71e8d77c3f9f8b9d92ae (diff) | |
| parent | bb6daf55c88addd58db914e62245b3e3296308b8 (diff) | |
| download | Qt-162bc6d94fadbfc9216d45eede4dc6d4fc2d5eef.zip Qt-162bc6d94fadbfc9216d45eede4dc6d4fc2d5eef.tar.gz Qt-162bc6d94fadbfc9216d45eede4dc6d4fc2d5eef.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Don't crash when applications set Qt::WA_TranslucentBackground.
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index a0429d3..02e7cb8 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -387,7 +387,6 @@ void QWidgetPrivate::create_sys(WId window, bool /* initializeWindow */, bool de | EPointerFilterMove | EPointerFilterDrag, 0); drawableWindow->EnableVisibilityChangeEvents(); - s60UpdateIsOpaque(); } q->setAttribute(Qt::WA_WState_Created); @@ -400,6 +399,9 @@ void QWidgetPrivate::create_sys(WId window, bool /* initializeWindow */, bool de // this generates a WinIdChanged event. setWinId(control.take()); + if (!desktop) + s60UpdateIsOpaque(); // must be called after setWinId() + } else if (q->testAttribute(Qt::WA_NativeWindow) || paintOnScreen()) { // create native child widget QScopedPointer<QSymbianControl> control( q_check_ptr(new QSymbianControl(q)) ); |