Windows: Fix for frameless widgets.

Let Qt::FramelessWindowHint take precedence over
Qt::WindowTitleHint (which enforces WS_CAPTION and thus
WS_DLGFRAME).

Change-Id: I2c0248d8a3ee3ed0f04b926acdef3cbeb98ca571
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 38a44e2..8798048 100644 (file)
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -338,9 +338,9 @@ void WindowCreationData::fromWindow(const QWindow *w, const Qt::WindowFlags flag
                     } else {
                         style |= WS_THICKFRAME;
                     }
+                    if (flags & Qt::WindowTitleHint)
+                        style |= WS_CAPTION; // Contains WS_DLGFRAME
                 }
-                if (flags & Qt::WindowTitleHint)
-                    style |= WS_CAPTION;
                 if (flags & Qt::WindowSystemMenuHint)
                     style |= WS_SYSMENU;
                 if (flags & Qt::WindowMinimizeButtonHint)