diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-31 01:00:13 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-31 01:00:13 +0200 |
commit | ffb2c2ac6c3ba40acbe13a39899a72049585b427 (patch) | |
tree | dbee14e6d1641e02ea1fd5fc67ce001ab12776ef /tests/auto/widgets/graphicsview | |
parent | 6d0044f1dcffebc29dccd9d37d90f8abdb941a88 (diff) | |
parent | dbdd5f0ffbce52c8b789ed09f1aa3f1da6c02e23 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I33b47095efdfe0ba698c6a88ca41ec911f432208
Diffstat (limited to 'tests/auto/widgets/graphicsview')
-rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp index 8287b9ebdd..4cd2fef2dc 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp @@ -281,7 +281,7 @@ void tst_QGraphicsProxyWidget::initTestCase() // This will be called after every test function. void tst_QGraphicsProxyWidget::cleanup() { - QVERIFY(QApplication::topLevelWidgets().isEmpty()); + QTRY_VERIFY(QApplication::topLevelWidgets().isEmpty()); } void tst_QGraphicsProxyWidget::qgraphicsproxywidget_data() @@ -2575,6 +2575,22 @@ void tst_QGraphicsProxyWidget::changingCursor_basic() } #endif +static bool findViewAndTipLabel(const QWidget *view) +{ + bool foundView = false; + bool foundTipLabel = false; + const QWidgetList &topLevels = QApplication::topLevelWidgets(); + for (const QWidget *widget : topLevels) { + if (widget == view) + foundView = true; + if (widget->inherits("QTipLabel")) + foundTipLabel = true; + if (foundView && foundTipLabel) + return true; + } + return false; +} + void tst_QGraphicsProxyWidget::tooltip_basic() { QString toolTip = "Qt rocks!"; @@ -2627,18 +2643,7 @@ void tst_QGraphicsProxyWidget::tooltip_basic() QHelpEvent helpEvent(QEvent::ToolTip, view.mapFromScene(proxy->boundingRect().center()), view.viewport()->mapToGlobal(view.mapFromScene(proxy->boundingRect().center()))); QApplication::sendEvent(view.viewport(), &helpEvent); - QTest::qWait(350); - - bool foundView = false; - bool foundTipLabel = false; - foreach (QWidget *widget, QApplication::topLevelWidgets()) { - if (widget == &view) - foundView = true; - if (widget->inherits("QTipLabel")) - foundTipLabel = true; - } - QVERIFY(foundView); - QVERIFY(foundTipLabel); + QTRY_VERIFY(findViewAndTipLabel(&view)); } } |