diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-05 23:00:12 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-05 23:00:12 (GMT) |
| commit | 4027b59d8ea97821301db7c66607fb8fe1ef295b (patch) | |
| tree | de62b8b73d4ba0b91b4ed88fd9a80d04c8d23144 /tests/auto/qtreewidget/tst_qtreewidget.cpp | |
| parent | 9ec03f667410ab672c855fad8061dbb5f7b20711 (diff) | |
| parent | 6ac4bc5cb7ac7500b39ea6828fdf76e95a2c2f0b (diff) | |
| download | Qt-4027b59d8ea97821301db7c66607fb8fe1ef295b.zip Qt-4027b59d8ea97821301db7c66607fb8fe1ef295b.tar.gz Qt-4027b59d8ea97821301db7c66607fb8fe1ef295b.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'tests/auto/qtreewidget/tst_qtreewidget.cpp')
| -rw-r--r-- | tests/auto/qtreewidget/tst_qtreewidget.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qtreewidget/tst_qtreewidget.cpp b/tests/auto/qtreewidget/tst_qtreewidget.cpp index 1e37384..32bf557 100644 --- a/tests/auto/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/qtreewidget/tst_qtreewidget.cpp @@ -464,6 +464,7 @@ void tst_QTreeWidget::editItem() QTreeWidget tree; populate(&tree, topLevelItems, new TreeItem(QStringList() << "1" << "2")); tree.show(); + QTest::qWaitForWindowShown(&tree); QSignalSpy itemChangedSpy( &tree, SIGNAL(itemChanged(QTreeWidgetItem*,int))); @@ -3098,8 +3099,9 @@ void tst_QTreeWidget::task253109_itemHeight() void tst_QTreeWidget::task206367_duplication() { - QTreeWidget treeWidget; - treeWidget.show(); + QWidget topLevel; + QTreeWidget treeWidget(&topLevel); + topLevel.show(); treeWidget.resize(200, 200); treeWidget.setSortingEnabled(true); |