1 files changed, 48 insertions, 4 deletions

diff --git a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
index 353c44d6b3..b0a53ba01a 100644
--- a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
+++ b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 
 #include <QTest>
@@ -23,6 +23,7 @@ private slots:
     void tempMessage();
     void insertWidget();
     void insertPermanentWidget();
+    void removeWidget();
     void setSizeGripEnabled();
     void task194017_hiddenWidget();
     void QTBUG4334_hiddenOnMaximizedWindow();
@@ -104,6 +105,49 @@ void tst_QStatusBar::insertPermanentWidget()
     QCOMPARE(sb.insertPermanentWidget(1, new QLabel("foo")), 6);
 }
 
+void tst_QStatusBar::removeWidget()
+{
+    QStatusBar sb;
+    std::vector<std::unique_ptr<QLabel>> widgets;
+    std::vector<bool> states;
+    for (int i = 0; i < 10; ++i) {
+        const QString text = i > 5 ? QString("p_%1").arg(i) : QString::number(i);
+        widgets.push_back(std::make_unique<QLabel>(text));
+        states.push_back(true);
+    }
+
+    for (auto &&widget : widgets) {
+        if (widget->text().startsWith("p_"))
+            sb.addPermanentWidget(widget.get());
+        else
+            sb.addWidget(widget.get());
+    }
+    sb.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&sb));
+
+    auto checkStates = [&]{
+        for (size_t index = 0; index < std::size(widgets); ++index) {
+            if (widgets.at(index)->isVisible() != states.at(index)) {
+                qCritical("Mismatch for widget at index %zu\n"
+                          "\tActual  : %s\n"
+                          "\tExpected: %s",
+                          index, widgets.at(index)->isVisible() ? "true" : "false",
+                          states.at(index) ? "true" : "false");
+                return false;
+            }
+        }
+        return true;
+    };
+
+    QVERIFY(checkStates());
+    // remove every widget except the first to trigger unstable reference
+    for (size_t i = 2; i < std::size(widgets); ++i) {
+        sb.removeWidget(widgets[i].get());
+        states[i] = false;
+        QVERIFY2(checkStates(), qPrintable(QString("Failure at index %1").arg(i)));
+    }
+}
+
 void tst_QStatusBar::setSizeGripEnabled()
 {
     if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
@@ -272,18 +316,18 @@ void tst_QStatusBar::messageChangedSignal()
     testWidget->showMessage("Ready", 0);
     QCOMPARE(testWidget->currentMessage(), QString("Ready"));
     QCOMPARE(testWidget->currentMessage(), currentMessage);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(spy.takeFirst().at(0).toString(), currentMessage);
     testWidget->clearMessage();
     QCOMPARE(testWidget->currentMessage(), QString());
     QCOMPARE(testWidget->currentMessage(), currentMessage);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(spy.takeFirst().at(0).toString(), currentMessage);
     testWidget->showMessage("Ready", 0);
     testWidget->showMessage("Ready", 0);
     QCOMPARE(testWidget->currentMessage(), QString("Ready"));
     QCOMPARE(testWidget->currentMessage(), currentMessage);
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QCOMPARE(spy.takeFirst().at(0).toString(), currentMessage);
 }