Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6

1 files changed, 8 insertions, 5 deletions

diff --git a/src/gui/kernel/qguifunctions_wince.cpp b/src/gui/kernel/qguifunctions_wince.cpp
index a6b8502..048780e 100644
--- a/src/gui/kernel/qguifunctions_wince.cpp
+++ b/src/gui/kernel/qguifunctions_wince.cpp
@@ -327,20 +327,23 @@ void qt_wince_maximize(QWidget *widget)
     }
 }
 
-void qt_wince_minimize(HWND hwnd) {
-
-    uint exstyle = GetWindowLong(hwnd, GWL_EXSTYLE);
-    uint style = GetWindowLong(hwnd, GWL_STYLE);
+void qt_wince_minimize(HWND hwnd)
+{
+    uint exstyle = GetWindowLongW(hwnd, GWL_EXSTYLE);
+    uint style = GetWindowLongW(hwnd, GWL_STYLE);
     RECT rect;
     RECT crect = {0,0,0,0};
     GetWindowRect(hwnd, &rect);
     AdjustWindowRectEx(&crect, style & ~WS_OVERLAPPED, FALSE, exstyle);
     MoveWindow(hwnd, rect.left - crect.left, rect.top - crect.top, 0, 0, true);
     SetWindowLong(hwnd, GWL_EXSTYLE, GetWindowLong (hwnd, GWL_EXSTYLE) | WS_EX_NODRAG);
+#ifdef Q_OS_WINCE_WM
     ShowWindow(hwnd, SW_HIDE);
+#else
+    ShowWindow(hwnd, SW_MINIMIZE);
+#endif
 }
 
-
 void qt_wince_hide_taskbar(HWND hwnd) {
     if (ptrAygFullScreen)
         ptrAygFullScreen(hwnd, SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON | SHFS_HIDESTARTICON);