diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 22:45:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 22:45:21 (GMT) |
| commit | f560032067ee6b2e4c1badf34cc92e01ec5e9afa (patch) | |
| tree | 0a480542a52032c7bd0330248e0a4512be70241d /tests/auto | |
| parent | ffa103af9620998f47c632f4118e789bf7f1cde7 (diff) | |
| parent | de73874e1f52ed323b87a36d072048023d22112e (diff) | |
| download | Qt-f560032067ee6b2e4c1badf34cc92e01ec5e9afa.zip Qt-f560032067ee6b2e4c1badf34cc92e01ec5e9afa.tar.gz Qt-f560032067ee6b2e4c1badf34cc92e01ec5e9afa.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed the position of the dock widget when undocked
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qdockwidget/tst_qdockwidget.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/auto/qdockwidget/tst_qdockwidget.cpp b/tests/auto/qdockwidget/tst_qdockwidget.cpp index a734985..8d9e7bbf 100644 --- a/tests/auto/qdockwidget/tst_qdockwidget.cpp +++ b/tests/auto/qdockwidget/tst_qdockwidget.cpp @@ -96,6 +96,7 @@ private slots: void task248604_infiniteResize(); void task258459_visibilityChanged(); void taskQTBUG_1665_closableChanged(); + void taskQTBUG_9758_undockedGeometry(); }; // Testing get/set functions @@ -878,6 +879,25 @@ void tst_QDockWidget::taskQTBUG_1665_closableChanged() QVERIFY(!(dock.windowFlags() & Qt::WindowCloseButtonHint)); } +void tst_QDockWidget::taskQTBUG_9758_undockedGeometry() +{ + QMainWindow window; + QDockWidget dock1(&window); + QDockWidget dock2(&window); + window.addDockWidget(Qt::RightDockWidgetArea, &dock1); + window.addDockWidget(Qt::RightDockWidgetArea, &dock2); + window.tabifyDockWidget(&dock1, &dock2); + dock1.hide(); + dock2.hide(); + window.show(); + dock1.setFloating(true); + dock1.show(); + + QVERIFY(dock1.x() >= 0); + QVERIFY(dock1.y() >= 0); +} + + QTEST_MAIN(tst_QDockWidget) #include "tst_qdockwidget.moc" |