Merge branch '1.0' into master

tests/tst_docks.cpp

@@ -428,6 +428,7 @@ private Q_SLOTS:
     void tst_tabsNotClickable();
     void tst_stuckSeparator();
     void tst_isFocused();
+    void tst_setWidget();
 
 private:
     std::unique_ptr<MultiSplitter> createMultiSplitterFromSetup(MultiSplitterSetup setup, QHash<QWidget *, Frame *> &frameMap) const;
@@ -5809,6 +5810,18 @@ void TestDocks::tst_isFocused()
     delete dock2->window();
 }
 
+void TestDocks::tst_setWidget()
+{
+    EnsureTopLevelsDeleted e;
+    auto dw = new DockWidget(QStringLiteral("FOO"));
+    auto button1 = new QPushButton("button1");
+    auto button2 = new QPushButton("button2");
+    dw->setWidget(button1);
+    dw->setWidget(button2);
+    delete button1;
+    delete dw;
+}
+
 int main(int argc, char *argv[])
 {
     if (!qpaPassedAsArgument(argc, argv)) {