1 files changed, 43 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
index edcfdcfca2..667c6868b7 100644
--- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
+++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
@@ -58,6 +58,8 @@ private slots:
     void replaceWidget();
     void replaceWidgetWithSplitterChild_data();
     void replaceWidgetWithSplitterChild();
+    void replaceWidgetWhileHidden_data();
+    void replaceWidgetWhileHidden();
     void handleMinimumWidth();
 
     // task-specific tests below me:
@@ -829,6 +831,47 @@ void tst_QSplitter::replaceWidgetWithSplitterChild()
     }
 }
 
+void tst_QSplitter::replaceWidgetWhileHidden_data()
+{
+    QTest::addColumn<bool>("splitterVisible");
+    QTest::addColumn<bool>("widgetVisible");
+
+    QTest::addRow("visibleToVisible") << true << true;
+    QTest::addRow("hiddenToVisible") << true << false;
+    QTest::addRow("visibleToHidden") << false << true;
+    QTest::addRow("hiddenToHidden") << false << false;
+}
+
+void tst_QSplitter::replaceWidgetWhileHidden()
+{
+    QFETCH(bool, splitterVisible);
+    QFETCH(bool, widgetVisible);
+
+    MyFriendlySplitter splitter;
+
+    splitter.addWidget(new QLabel("One"));
+    splitter.addWidget(new QLabel("Two"));
+
+    if (splitterVisible) {
+        splitter.show();
+        QVERIFY(QTest::qWaitForWindowExposed(&splitter));
+    }
+    QWidget *newWidget = new QLabel("Three");
+    if (!widgetVisible)
+        newWidget->hide();
+
+    const bool wasExplicitHide = !widgetVisible && newWidget->testAttribute(Qt::WA_WState_ExplicitShowHide);
+    splitter.replaceWidget(1, newWidget);
+
+    QCOMPARE(!widgetVisible && newWidget->testAttribute(Qt::WA_WState_ExplicitShowHide), wasExplicitHide);
+
+    if (!splitterVisible) {
+        splitter.show();
+        QVERIFY(QTest::qWaitForWindowExposed(&splitter));
+    }
+    QCOMPARE(widgetVisible, newWidget->isVisible());
+}
+
 void tst_QSplitter::handleMinimumWidth()
 {
     MyFriendlySplitter split;