Revert "QWorkspace: fix hardcoded min size overwriting the real min size"

This reverts commit b3a46493a1a74bd7918bd68638c28cf6e84eb57f.

2 files changed, 6 insertions, 19 deletions

diff --git a/src/gui/widgets/qworkspace.cpp b/src/gui/widgets/qworkspace.cpp
index 3a9b30c..7180c4d 100644
--- a/src/gui/widgets/qworkspace.cpp
+++ b/src/gui/widgets/qworkspace.cpp
@@ -2551,6 +2551,7 @@ QWorkspaceChild::QWorkspaceChild(QWidget* window, QWorkspace *parent, Qt::Window
                  this, SLOT(titleBarDoubleClicked()));
     }
 
+    setMinimumSize(128, 0);
     int fw =  style()->pixelMetric(QStyle::PM_MdiSubWindowFrameWidth, 0, this);
     setContentsMargins(fw, fw, fw, fw);
 
@@ -2701,15 +2702,11 @@ QSize QWorkspaceChild::sizeHint() const
 
 QSize QWorkspaceChild::minimumSizeHint() const
 {
-    QSize s;
-    if (!childWidget) {
-        s = QWidget::minimumSizeHint();
-    } else {
-        s = childWidget->minimumSize();
-        if (s.isEmpty())
-            s = childWidget->minimumSizeHint();
-    }
-    s = s.expandedTo(QSize(128, 0));
+    if (!childWidget)
+        return QWidget::minimumSizeHint() + baseSize();
+    QSize s = childWidget->minimumSize();
+    if (s.isEmpty())
+        s = childWidget->minimumSizeHint();
     return s + baseSize();
 }
 
diff --git a/tests/auto/qworkspace/tst_qworkspace.cpp b/tests/auto/qworkspace/tst_qworkspace.cpp
index 9039eb3..4cf76b5 100644
--- a/tests/auto/qworkspace/tst_qworkspace.cpp
+++ b/tests/auto/qworkspace/tst_qworkspace.cpp
@@ -44,7 +44,6 @@
 #include <qapplication.h>
 #include <qmainwindow.h>
 #include <qmenubar.h>
-#include <qlayout.h>
 #include <qworkspace.h>
 #if defined(QT3_SUPPORT)
 #include <q3popupmenu.h>
@@ -592,25 +591,16 @@ void tst_QWorkspace::childSize()
 
     MyChild *child = new MyChild(&ws);
     child->show();
-    ws.addWindow(child);
     QCOMPARE(child->size(), child->sizeHint());
     delete child;
 
     child = new MyChild(&ws);
     child->setFixedSize(200, 200);
     child->show();
-    ws.addWindow(child);
     QCOMPARE(child->size(), child->minimumSize());
-    QCOMPARE(child->parentWidget()->metaObject()->className(), "QWorkspaceChild");
-    QVERIFY(child->parentWidget()->width() >= 200);
-    // check that the minimum size is respected, using closestAcceptableSize
-    // like QSizeGrip does.
-    const QSize newSize = QLayout::closestAcceptableSize(child->parentWidget(), QSize(100, 100));
-    QVERIFY(newSize.width() >= 200);
     delete child;
 
     child = new MyChild(&ws);
-    ws.addWindow(child);
     child->resize(150, 150);
     child->show();
     QCOMPARE(child->size(), QSize(150,150));