diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-09-03 13:32:03 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-09-03 13:32:03 (GMT) |
| commit | e7ff8a7eebd111483a561190011dc14f234a6313 (patch) | |
| tree | 7df5a5ef577f790f2eae71cfa4292ca72e733658 /src | |
| parent | 2ae17a14052f29d7e5e14a957d9b2c9fbc7cdf5f (diff) | |
| parent | 2669c6114062156b9fb77141afd0431c628d8599 (diff) | |
| download | Qt-e7ff8a7eebd111483a561190011dc14f234a6313.zip Qt-e7ff8a7eebd111483a561190011dc14f234a6313.tar.gz Qt-e7ff8a7eebd111483a561190011dc14f234a6313.tar.bz2 | |
Merge commit 'origin/4.5' into 4.6
Conflicts:
src/gui/kernel/qapplication_win.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index d23494e..84edf1f 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -2026,13 +2026,16 @@ 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. -#ifndef Q_WS_WINCE_WM - if (!(widget->windowState() & Qt::WindowMinimized)) { - // Ignore the activate message send by WindowsXP to a minimized window -#else +#ifdef Q_WS_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_WS_WINCE_WM + { if (widget->windowState() & Qt::WindowFullScreen) qt_wince_hide_taskbar(widget->winId()); #endif |