Merge remote-tracking branch 'origin/5.10' into dev

 Conflicts:
	.qmake.conf
	src/qml/memory/qv4mm.cpp
	src/qml/qml/qqmlbinding.cpp

Change-Id: I98e51ef5af12691196da5772a07d3d53d213efcc

1 files changed, 17 insertions, 1 deletions

diff --git a/src/plugins/qmltooling/qmldbg_inspector/qquickwindowinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/qquickwindowinspector.cpp
index 16056addbd..d3bd1ac956 100644
--- a/src/plugins/qmltooling/qmldbg_inspector/qquickwindowinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_inspector/qquickwindowinspector.cpp
@@ -169,13 +169,29 @@ bool QQuickWindowInspector::eventFilter(QObject *obj, QEvent *event)
     return QObject::eventFilter(obj, event);
 }
 
+static Qt::WindowFlags fixFlags(Qt::WindowFlags flags)
+{
+    // If only the type flag is given, some other window flags are automatically assumed. When we
+    // add a flag, we need to make those explicit.
+    switch (flags) {
+    case Qt::Window:
+        return flags | Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint
+                | Qt::WindowMinimizeButtonHint | Qt::WindowMaximizeButtonHint;
+    case Qt::Dialog:
+    case Qt::Tool:
+        return flags | Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint;
+    default:
+        return flags;
+    }
+}
+
 void QQuickWindowInspector::setShowAppOnTop(bool appOnTop)
 {
     if (!m_parentWindow)
         return;
 
     Qt::WindowFlags flags = m_parentWindow->flags();
-    Qt::WindowFlags newFlags = appOnTop ? (flags | Qt::WindowStaysOnTopHint) :
+    Qt::WindowFlags newFlags = appOnTop ? (fixFlags(flags) | Qt::WindowStaysOnTopHint) :
                                           (flags & ~Qt::WindowStaysOnTopHint);
     if (newFlags != flags)
         m_parentWindow->setFlags(newFlags);