aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qquickpopup
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qquickpopup')
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose1.qml4
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose2.qml4
-rw-r--r--tests/auto/qquickpopup/data/activeFocusOnClose3.qml4
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow-hover.qml4
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow-wheel.qml4
-rw-r--r--tests/auto/qquickpopup/data/applicationwindow.qml4
-rw-r--r--tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml4
-rw-r--r--tests/auto/qquickpopup/data/cursor.qml4
-rw-r--r--tests/auto/qquickpopup/data/grabber.qml4
-rw-r--r--tests/auto/qquickpopup/data/nested.qml4
-rw-r--r--tests/auto/qquickpopup/data/orientation.qml4
-rw-r--r--tests/auto/qquickpopup/data/window-hover.qml4
-rw-r--r--tests/auto/qquickpopup/data/window-wheel.qml4
-rw-r--r--tests/auto/qquickpopup/data/window.qml4
-rw-r--r--tests/auto/qquickpopup/tst_qquickpopup.cpp4
15 files changed, 28 insertions, 32 deletions
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml
index ee0295c1..ed9b65e1 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClose1.qml
+++ b/tests/auto/qquickpopup/data/activeFocusOnClose1.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml
index cb215f9b..d089fbbb 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClose2.qml
+++ b/tests/auto/qquickpopup/data/activeFocusOnClose2.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/activeFocusOnClose3.qml b/tests/auto/qquickpopup/data/activeFocusOnClose3.qml
index a8137b34..20bd7941 100644
--- a/tests/auto/qquickpopup/data/activeFocusOnClose3.qml
+++ b/tests/auto/qquickpopup/data/activeFocusOnClose3.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/applicationwindow-hover.qml b/tests/auto/qquickpopup/data/applicationwindow-hover.qml
index 8cec6ba7..7b688147 100644
--- a/tests/auto/qquickpopup/data/applicationwindow-hover.qml
+++ b/tests/auto/qquickpopup/data/applicationwindow-hover.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/applicationwindow-wheel.qml b/tests/auto/qquickpopup/data/applicationwindow-wheel.qml
index a89bd0f6..de27d7ec 100644
--- a/tests/auto/qquickpopup/data/applicationwindow-wheel.qml
+++ b/tests/auto/qquickpopup/data/applicationwindow-wheel.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
ApplicationWindow {
id: window
diff --git a/tests/auto/qquickpopup/data/applicationwindow.qml b/tests/auto/qquickpopup/data/applicationwindow.qml
index 659aa843..3ce8a718 100644
--- a/tests/auto/qquickpopup/data/applicationwindow.qml
+++ b/tests/auto/qquickpopup/data/applicationwindow.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.1
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml b/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
index f41516c8..4f18fc13 100644
--- a/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
+++ b/tests/auto/qquickpopup/data/closeOnEscapeWithNestedPopups.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.10
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/cursor.qml b/tests/auto/qquickpopup/data/cursor.qml
index fd4475a0..4391f7a0 100644
--- a/tests/auto/qquickpopup/data/cursor.qml
+++ b/tests/auto/qquickpopup/data/cursor.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/grabber.qml b/tests/auto/qquickpopup/data/grabber.qml
index b9995b54..6a6d6d65 100644
--- a/tests/auto/qquickpopup/data/grabber.qml
+++ b/tests/auto/qquickpopup/data/grabber.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/nested.qml b/tests/auto/qquickpopup/data/nested.qml
index 48e51fc8..4ebdfb0c 100644
--- a/tests/auto/qquickpopup/data/nested.qml
+++ b/tests/auto/qquickpopup/data/nested.qml
@@ -48,8 +48,8 @@
**
****************************************************************************/
-import QtQuick 2.6
-import QtQuick.Controls 2.0
+import QtQuick 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
width: 400
diff --git a/tests/auto/qquickpopup/data/orientation.qml b/tests/auto/qquickpopup/data/orientation.qml
index cbf69b2b..a1cc9c0e 100644
--- a/tests/auto/qquickpopup/data/orientation.qml
+++ b/tests/auto/qquickpopup/data/orientation.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
Window {
width: 600
diff --git a/tests/auto/qquickpopup/data/window-hover.qml b/tests/auto/qquickpopup/data/window-hover.qml
index 669afb08..0bf00660 100644
--- a/tests/auto/qquickpopup/data/window-hover.qml
+++ b/tests/auto/qquickpopup/data/window-hover.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
Window {
width: 400
diff --git a/tests/auto/qquickpopup/data/window-wheel.qml b/tests/auto/qquickpopup/data/window-wheel.qml
index 45c09b45..37edee95 100644
--- a/tests/auto/qquickpopup/data/window-wheel.qml
+++ b/tests/auto/qquickpopup/data/window-wheel.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
Window {
id: window
diff --git a/tests/auto/qquickpopup/data/window.qml b/tests/auto/qquickpopup/data/window.qml
index 962ab573..0e15e838 100644
--- a/tests/auto/qquickpopup/data/window.qml
+++ b/tests/auto/qquickpopup/data/window.qml
@@ -48,9 +48,9 @@
**
****************************************************************************/
-import QtQuick 2.6
+import QtQuick 2.12
import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
+import QtQuick.Controls 2.12
Window {
width: 400
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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 11:38:08 +0000