2 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 96c2bc08e9..9d15240350 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -991,6 +991,9 @@ void QWindowsWindow::handleResized(int wParam)
 
 void QWindowsWindow::handleGeometryChange()
 {
+    //Prevent recursive resizes for Windows CE
+    if (testFlag(WithinSetStyle))
+        return;
     m_data.geometry = geometry_sys();
     QPlatformWindow::setGeometry(m_data.geometry);
     if (testFlag(SynchronousGeometryChangeEvent))
@@ -1295,8 +1298,10 @@ void QWindowsWindow::setStyle(unsigned s) const
 {
     if (QWindowsContext::verboseWindows)
         qDebug() << __FUNCTION__ << this << window() << debugWinStyle(s);
+    setFlag(WithinSetStyle);
     setFlag(FrameDirty);
     SetWindowLongPtr(m_data.hwnd, GWL_STYLE, s);
+    clearFlag(WithinSetStyle);
 }
 
 void QWindowsWindow::setExStyle(unsigned s) const
diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
index b2b33302f6..b45b00b434 100644
--- a/src/plugins/platforms/windows/qwindowswindow.h
+++ b/src/plugins/platforms/windows/qwindowswindow.h
@@ -125,7 +125,8 @@ public:
         BlockedByModal = 0x80,
         SizeGripOperation = 0x100,
         FrameStrutEventsEnabled = 0x200,
-        SynchronousGeometryChangeEvent = 0x400
+        SynchronousGeometryChangeEvent = 0x400,
+        WithinSetStyle = 0x800
     };
 
     struct WindowData