1 files changed, 69 insertions, 1 deletions

diff --git a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
index b2650d1f32..00bde3cb25 100644
--- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
@@ -47,6 +47,7 @@ private slots:
     void sizeConstraints();
     void setGeometry();
     void setStyleShouldChangeSpacing();
+    void widgetSurplus();
 
     void testLayoutEngine_data();
     void testLayoutEngine();
@@ -193,7 +194,7 @@ void tst_QBoxLayout::setGeometry()
     setFrameless(&toplevel);
     QWidget w(&toplevel);
     QVBoxLayout *lay = new QVBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     lay->setSpacing(0);
     QHBoxLayout *lay2 = new QHBoxLayout;
     QDial *dial = new QDial;
@@ -236,6 +237,69 @@ void tst_QBoxLayout::setStyleShouldChangeSpacing()
     QTRY_COMPARE(spacing(), 10);
 }
 
+class MarginEatingStyle : public QProxyStyle
+{
+public:
+    MarginEatingStyle() : QProxyStyle(QStyleFactory::create("windows"))
+    {
+    }
+
+    virtual QRect subElementRect(SubElement sr, const QStyleOption *opt,
+                                const QWidget *widget) const
+    {
+        QRect rect = opt->rect;
+        switch (sr) {
+        case SE_GroupBoxLayoutItem:
+            // this is a simplifed version of what the macOS style does
+            rect.setTop(rect.top() + 20);
+            rect.setLeft(rect.left() + 20);
+            rect.setRight(rect.right() - 20);
+            rect.setBottom(rect.bottom() - 20);
+            break;
+        default:
+            return QProxyStyle::subElementRect(sr, opt, widget);
+        }
+
+        return rect;
+    }
+};
+
+void tst_QBoxLayout::widgetSurplus()
+{
+    // Test case for QTBUG-67608 - a style requests space in the margin
+
+    QDialog window;
+    QScopedPointer<MarginEatingStyle> marginEater(new MarginEatingStyle);
+    QVBoxLayout *vbox = new QVBoxLayout(&window);
+    vbox->setContentsMargins(0, 0, 0, 0);
+    vbox->setSpacing(0);
+
+    QLabel *hiddenLabel = new QLabel(tr("Invisible label"));
+    hiddenLabel->setVisible(false);
+
+    QGroupBox *groupBox = new QGroupBox(tr("Groupbox Title"));
+    groupBox->setStyle(marginEater.data());
+    groupBox->setObjectName("Test group box");
+    QPushButton *button1 = new QPushButton(tr("Button 1"));
+    QPushButton *button2 = new QPushButton(tr("Button 2"));
+    QVBoxLayout *groupLayout = new QVBoxLayout;
+    groupLayout->addWidget(button1);
+    groupLayout->addWidget(button2);
+    groupBox->setLayout(groupLayout);
+
+    QLabel *label = new QLabel(tr("Visible label"));
+
+    vbox->addWidget(hiddenLabel);
+    vbox->addWidget(groupBox);
+    vbox->addWidget(label);
+    window.setLayout(vbox);
+
+    window.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&window));
+    QCOMPARE(groupBox->y(), 0);
+    QCOMPARE(groupBox->x(), 0);
+}
+
 void tst_QBoxLayout::taskQTBUG_7103_minMaxWidthNotRespected()
 {
     QLabel *label = new QLabel("Qt uses standard C++, but makes extensive use of the C pre-processor to enrich the language. Qt can also be used in several other programming languages via language bindings. It runs on all major platforms, and has extensive internationalization support. Non-GUI features include SQL database access, XML parsing, thread management, network support and a unified cross-platform API for file handling.");
@@ -507,6 +571,10 @@ void tst_QBoxLayout::replaceWidget()
 
     QCOMPARE(boxLayout->indexOf(replaceFrom), 1);
     QCOMPARE(boxLayout->indexOf(replaceTo), -1);
+    QCOMPARE(boxLayout->count(), 3);
+    boxLayout->replaceWidget(replaceFrom, replaceFrom);
+    QCOMPARE(boxLayout->count(), 3);
+
     delete boxLayout->replaceWidget(replaceFrom, replaceTo);
 
     QCOMPARE(boxLayout->indexOf(replaceFrom), -1);