diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
| commit | efa04c2ae8427c70848477ace3d8f6e82baaab11 (patch) | |
| tree | c0394c9cd5ce51961337a7a15e169074dd41632b /tests/auto/qquickpopup/tst_qquickpopup.cpp | |
| parent | 9c7429219d36e8eb40e1fe6e679715c89209fc40 (diff) | |
| parent | 6476de0b669162cf08c11f5c8d5ad0b42419f365 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/imports/controls/qtquickcontrols2plugin.cpp
Change-Id: I27f1260b539354e084beb28be78385e57fda63e1
Diffstat (limited to 'tests/auto/qquickpopup/tst_qquickpopup.cpp')
| -rw-r--r-- | tests/auto/qquickpopup/tst_qquickpopup.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp index 6c860d6e..9230116b 100644 --- a/tests/auto/qquickpopup/tst_qquickpopup.cpp +++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp @@ -36,7 +36,6 @@ #include <QtTest/qtest.h> #include <QtTest/qsignalspy.h> -#include "../shared/menuutil.h" #include "../shared/util.h" #include "../shared/visualtestutil.h" #include "../shared/qtest_quickcontrols.h" @@ -859,7 +858,6 @@ void tst_QQuickPopup::grabber() menu->open(); QTRY_COMPARE(menu->isOpened(), true); - waitForMenuListViewPolish(menu); QCOMPARE(popup->isVisible(), false); QCOMPARE(combo->isVisible(), false); @@ -882,7 +880,6 @@ void tst_QQuickPopup::grabber() menu->open(); QTRY_COMPARE(menu->isOpened(), true); - waitForMenuListViewPolish(menu); QCOMPARE(popup->isVisible(), false); QCOMPARE(combo->isVisible(), false); @@ -974,7 +971,6 @@ void tst_QQuickPopup::closeOnEscapeWithNestedPopups() QQuickPopup *optionsMenu = window->findChild<QQuickPopup*>("optionsMenu"); QVERIFY(optionsMenu); QTRY_VERIFY(optionsMenu->isVisible()); - waitForMenuListViewPolish(optionsMenu); QQuickItem *settingsMenuItem = window->findChild<QQuickItem*>("settingsMenuItem"); QVERIFY(settingsMenuItem); |