diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-05 10:09:00 +0200 |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-05 10:09:00 +0200 |
| commit | bb587db95d7c20344c0bf06a1f080c0a2e4a9250 (patch) | |
| tree | 50c4615c0c5908bb5a26c1a3ee121dd1f7f070be /src/gui/kernel/qapplication_win.cpp | |
| parent | f26f5b230e614faecce33cf52af0a0d62dcaddaa (diff) | |
| parent | 555018baf3115cb2587d2217bf1a5b8f49564ad2 (diff) | |
| download | qt4-tools-bb587db95d7c20344c0bf06a1f080c0a2e4a9250.tar.gz | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/kernel/qapplication_win.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index d3bb6c295b..1261a206b7 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -2098,9 +2098,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. +#ifndef Q_WS_WINCE_WM if (!(widget->windowState() & Qt::WindowMinimized)) { // Ignore the activate message send by WindowsXP to a minimized window -#ifdef Q_WS_WINCE_WM +#else + { + if (widget->windowState() & Qt::WindowMinimized) + widget->dataPtr()->window_state &= ~Qt::WindowMinimized; if (widget->windowState() & Qt::WindowFullScreen) qt_wince_hide_taskbar(widget->winId()); #endif |