Merge branch '1.0' into master

2020-08-30 14:46:28 +01:00
parent b2df16dcb0 ae000e75bc
commit 92843b4972
5 changed files with 58 additions and 11 deletions
--- a/src/DockWidgetBase.cpp
+++ b/src/DockWidgetBase.cpp
@@ -212,11 +212,19 @@ void DockWidgetBase::addDockWidgetToContainingWindow(DockWidgetBase *other, Loca

 void DockWidgetBase::setWidget(QWidgetOrQuick *w)
 {
-    Q_ASSERT(w && !d->widget);
+    Q_ASSERT(w);
    qCDebug(addwidget) << Q_FUNC_INFO << w;
+    if (w == d->widget)
+        return;
+
+    if (d->widget) {
+        // Unparent the old widget, we're giving back ownership
+        d->widget->setParent(nullptr);
+    }

    d->widget = w;
-    setSizePolicy(w->sizePolicy());
+    if (w)
+        setSizePolicy(w->sizePolicy());

    Q_EMIT widgetChanged(w);
    setWindowTitle(uniqueName());