summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authoraavit <qt-info@nokia.com>2010-05-05 08:28:16 (GMT)
committeraavit <qt-info@nokia.com>2010-05-05 08:28:16 (GMT)
commit39c6ad12f97ca024ef4340edadb43c7f92327964 (patch)
tree3520ec3c8cfaf3a644bcee806792dfa89aaa060f /tests
parent87f7444d2af1299460bdbfc1cbfa903ea504b7e3 (diff)
parent44144cf60e978f7d5d70aec49d114d57832a78c3 (diff)
downloadQt-39c6ad12f97ca024ef4340edadb43c7f92327964.zip
Qt-39c6ad12f97ca024ef4340edadb43c7f92327964.tar.gz
Qt-39c6ad12f97ca024ef4340edadb43c7f92327964.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qdockwidget/tst_qdockwidget.cpp20
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"