diff options
author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2010-10-05 16:28:35 (GMT) |
---|---|---|
committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2010-10-05 16:28:35 (GMT) |
commit | cace0a51e21ff8275b887025b562fc79bec9f32f (patch) | |
tree | 64b5b1e795e50ec7f24a9d4636c972be2272170a /tests | |
parent | 8ed3d9e33de7b4ee93b007ebde16ce42885ba95c (diff) | |
download | Qt-cace0a51e21ff8275b887025b562fc79bec9f32f.zip Qt-cace0a51e21ff8275b887025b562fc79bec9f32f.tar.gz Qt-cace0a51e21ff8275b887025b562fc79bec9f32f.tar.bz2 |
Revert "QWorkspace: fix hardcoded min size overwriting the real min size"
This reverts commit b3a46493a1a74bd7918bd68638c28cf6e84eb57f.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qworkspace/tst_qworkspace.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
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)); |