Merge commit 'origin/4.5' into 4.6

Conflicts:
	src/gui/kernel/qapplication_win.cpp

1 files changed, 7 insertions, 4 deletions

diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index d23494ec4d..84edf1f667 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