diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-05-19 13:52:54 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-05-19 13:52:54 (GMT) |
| commit | 14ddb8172cce8c90f01436ab8215cc8ed594e251 (patch) | |
| tree | 04e860f80d7f3e9773996b62d4c56ad92497a096 /src/gui/kernel | |
| parent | 6bdba9c7909d8f53e28823b16e82f89650eea16d (diff) | |
| parent | de0858687898f6e0e54cce3f986779c7aa1a350e (diff) | |
| download | Qt-14ddb8172cce8c90f01436ab8215cc8ed594e251.zip Qt-14ddb8172cce8c90f01436ab8215cc8ed594e251.tar.gz Qt-14ddb8172cce8c90f01436ab8215cc8ed594e251.tar.bz2 | |
Merge commit 'remotes/origin/4.7' into symbian47
Conflicts:
src/gui/kernel/qapplication_s60.cpp
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_s60.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index 50b9759..60fc5e1 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -2477,7 +2477,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa QApplication::postEvent(widget, new QEvent(QEvent::Close)); else #ifndef QT_NO_MENUBAR - QMenuBar::wceCommands(LOWORD(wParam), (HWND) lParam); + QMenuBar::wceCommands(LOWORD(wParam)); #endif result = true; } 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)) ); |