Merge branch '1.1' into master

src/private/FloatingWindow.cpp

@@ -25,6 +25,7 @@
 #include <QCloseEvent>
 #include <QAbstractNativeEventFilter>
 #include <QWindow>
+#include <QScopedValueRollback>
 
 #if defined(Q_OS_WIN)
 # include <Windows.h>
@@ -341,6 +342,10 @@ void FloatingWindow::onVisibleFrameCountChanged(int count)
 
 void FloatingWindow::updateTitleBarVisibility()
 {
+    if (m_updatingTitleBarVisibility)
+        return; // Break recursion
+
+    QScopedValueRollback<bool> guard(m_updatingTitleBarVisibility, true);
     updateTitleAndIcon();
 
     bool visible = true;

src/private/FloatingWindow_p.h

@@ -145,6 +145,7 @@ private:
     bool m_disableSetVisible = false;
     bool m_deleteScheduled = false;
     bool m_inDtor = false;
+    bool m_updatingTitleBarVisibility = false;
     QMetaObject::Connection m_layoutDestroyedConnection;
     QAbstractNativeEventFilter *m_nchittestFilter = nullptr;
 };