diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-04 04:31:11 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-04 04:31:11 (GMT) |
| commit | cfa460f738de9fef28170b7d396578e67ae6a0f3 (patch) | |
| tree | ef7b8051c86681d9d1e96076b9214e9d54e839c8 | |
| parent | 93819237a17fbd17fc4161e7f44567b272bbb14b (diff) | |
| parent | 2669c6114062156b9fb77141afd0431c628d8599 (diff) | |
| download | Qt-cfa460f738de9fef28170b7d396578e67ae6a0f3.zip Qt-cfa460f738de9fef28170b7d396578e67ae6a0f3.tar.gz Qt-cfa460f738de9fef28170b7d396578e67ae6a0f3.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index ddc491b..b631dd5 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -2082,7 +2082,13 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam // WM_ACTIVATEAPP handles the "true" false case, as this is only when the application // loses focus. Doing it here would result in the widget getting focus to not know // where it got it from; it would simply get a 0 value as the old focus widget. +#ifdef Q_OS_WINCE + { + if (widget->windowState() & Qt::WindowMinimized) + widget->dataPtr()->window_state &= ~Qt::WindowMinimized; +#else if (!(widget->windowState() & Qt::WindowMinimized)) { +#endif // Ignore the activate message send by WindowsXP to a minimized window #ifdef Q_OS_WINCE_WM if (widget->windowState() & Qt::WindowFullScreen) |