diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | tests/auto/auto.pro | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/addItem.qml (renamed from tests/auto/menu/data/addItem.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/applicationwindow.qml (renamed from tests/auto/menu/data/applicationwindow.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/menuSeparator.qml (renamed from tests/auto/menu/data/menuSeparator.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/order.qml (renamed from tests/auto/menu/data/order.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/pressAndHold.qml (renamed from tests/auto/menu/data/pressAndHold.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/data/repeater.qml (renamed from tests/auto/menu/data/repeater.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qquickmenu/qquickmenu.pro (renamed from tests/auto/menu/menu.pro) | 4 | ||||
-rw-r--r-- | tests/auto/qquickmenu/tst_qquickmenu.cpp (renamed from tests/auto/menu/tst_menu.cpp) | 24 |
10 files changed, 17 insertions, 17 deletions
@@ -34,13 +34,13 @@ /tests/auto/cursor/tst_cursor /tests/auto/focus/tst_focus /tests/auto/font/tst_font -/tests/auto/menu/tst_menu /tests/auto/platform/tst_platform /tests/auto/pressandhold/tst_pressandhold /tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow /tests/auto/qquickdrawer/tst_qquickdrawer /tests/auto/qquickmaterialstyle/tst_qquickmaterialstyle /tests/auto/qquickmaterialstyleconf/tst_qquickmaterialstyleconf +/tests/auto/qquickmenu/tst_qquickmenu /tests/auto/qquickpopup/tst_qquickpopup /tests/auto/qquickstyle/tst_qquickstyle /tests/auto/qquickstyleselector/tst_qquickstyleselector diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 2eb23fd0..0aeef414 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -6,13 +6,13 @@ SUBDIRS += \ cursor \ focus \ font \ - menu \ platform \ pressandhold \ qquickapplicationwindow \ qquickdrawer \ qquickmaterialstyle \ qquickmaterialstyleconf \ + qquickmenu \ qquickpopup \ qquickstyle \ qquickstyleselector \ @@ -24,6 +24,6 @@ SUBDIRS += \ # QTBUG-60268 boot2qt: SUBDIRS -= qquickapplicationwindow calendar controls cursor \ - qquickdrawer focus font menu platform qquickpopup qquickmaterialstyle \ + qquickdrawer focus font qquickmenu platform qquickpopup qquickmaterialstyle \ qquickmaterialstyleconf qquickuniversalstyle \ qquickuniversalstyleconf snippets diff --git a/tests/auto/menu/data/addItem.qml b/tests/auto/qquickmenu/data/addItem.qml index 0668e439..0668e439 100644 --- a/tests/auto/menu/data/addItem.qml +++ b/tests/auto/qquickmenu/data/addItem.qml diff --git a/tests/auto/menu/data/applicationwindow.qml b/tests/auto/qquickmenu/data/applicationwindow.qml index 265a2f1a..265a2f1a 100644 --- a/tests/auto/menu/data/applicationwindow.qml +++ b/tests/auto/qquickmenu/data/applicationwindow.qml diff --git a/tests/auto/menu/data/menuSeparator.qml b/tests/auto/qquickmenu/data/menuSeparator.qml index 6cdf8b27..6cdf8b27 100644 --- a/tests/auto/menu/data/menuSeparator.qml +++ b/tests/auto/qquickmenu/data/menuSeparator.qml diff --git a/tests/auto/menu/data/order.qml b/tests/auto/qquickmenu/data/order.qml index db5c3c1a..db5c3c1a 100644 --- a/tests/auto/menu/data/order.qml +++ b/tests/auto/qquickmenu/data/order.qml diff --git a/tests/auto/menu/data/pressAndHold.qml b/tests/auto/qquickmenu/data/pressAndHold.qml index 6f0acd3a..6f0acd3a 100644 --- a/tests/auto/menu/data/pressAndHold.qml +++ b/tests/auto/qquickmenu/data/pressAndHold.qml diff --git a/tests/auto/menu/data/repeater.qml b/tests/auto/qquickmenu/data/repeater.qml index 2172f86a..2172f86a 100644 --- a/tests/auto/menu/data/repeater.qml +++ b/tests/auto/qquickmenu/data/repeater.qml diff --git a/tests/auto/menu/menu.pro b/tests/auto/qquickmenu/qquickmenu.pro index 9c9d9b48..ee539842 100644 --- a/tests/auto/menu/menu.pro +++ b/tests/auto/qquickmenu/qquickmenu.pro @@ -1,6 +1,6 @@ CONFIG += testcase -TARGET = tst_menu -SOURCES += tst_menu.cpp +TARGET = tst_qquickmenu +SOURCES += tst_qquickmenu.cpp macos:CONFIG -= app_bundle diff --git a/tests/auto/menu/tst_menu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp index 79598373..717e892b 100644 --- a/tests/auto/menu/tst_menu.cpp +++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp @@ -54,7 +54,7 @@ using namespace QQuickVisualTestUtil; -class tst_menu : public QQmlDataTest +class tst_QQuickMenu : public QQmlDataTest { Q_OBJECT @@ -72,7 +72,7 @@ private slots: void order(); }; -void tst_menu::defaults() +void tst_QQuickMenu::defaults() { QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml")); @@ -81,7 +81,7 @@ void tst_menu::defaults() QCOMPARE(emptyMenu->contentItem()->property("currentIndex"), QVariant(-1)); } -void tst_menu::mouse() +void tst_QQuickMenu::mouse() { QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml")); @@ -150,7 +150,7 @@ void tst_menu::mouse() // QCOMPARE(menu->contentItem()->property("currentIndex"), QVariant(-1)); } -void tst_menu::pressAndHold() +void tst_QQuickMenu::pressAndHold() { QQuickApplicationHelper helper(this, QLatin1String("pressAndHold.qml")); @@ -171,7 +171,7 @@ void tst_menu::pressAndHold() QTRY_VERIFY(!menu->isVisible()); } -void tst_menu::contextMenuKeyboard() +void tst_QQuickMenu::contextMenuKeyboard() { if (QGuiApplication::styleHints()->tabFocusBehavior() != Qt::TabFocusAllControls) QSKIP("This platform only allows tab focus for text controls"); @@ -291,7 +291,7 @@ void tst_menu::contextMenuKeyboard() QVERIFY(!menu->isVisible()); } -void tst_menu::menuButton() +void tst_QQuickMenu::menuButton() { if (QGuiApplication::styleHints()->tabFocusBehavior() != Qt::TabFocusAllControls) QSKIP("This platform only allows tab focus for text controls"); @@ -319,7 +319,7 @@ void tst_menu::menuButton() QVERIFY(firstItem->hasActiveFocus()); } -void tst_menu::addItem() +void tst_QQuickMenu::addItem() { QQuickApplicationHelper helper(this, QLatin1String("addItem.qml")); QQuickApplicationWindow *window = helper.appWindow; @@ -340,7 +340,7 @@ void tst_menu::addItem() QTRY_VERIFY(!menu->isVisible()); } -void tst_menu::menuSeparator() +void tst_QQuickMenu::menuSeparator() { QQuickApplicationHelper helper(this, QLatin1String("menuSeparator.qml")); QQuickWindow *window = helper.window; @@ -412,7 +412,7 @@ void tst_menu::menuSeparator() QCOMPARE(newMenuItem->focusReason(), Qt::BacktabFocusReason); } -void tst_menu::repeater() +void tst_QQuickMenu::repeater() { QQuickApplicationHelper helper(this, QLatin1String("repeater.qml")); QQuickWindow *window = helper.window; @@ -456,7 +456,7 @@ void tst_menu::repeater() } } -void tst_menu::order() +void tst_QQuickMenu::order() { QQuickApplicationHelper helper(this, QLatin1String("order.qml")); QQuickWindow *window = helper.window; @@ -477,6 +477,6 @@ void tst_menu::order() } } -QTEST_MAIN(tst_menu) +QTEST_MAIN(tst_QQuickMenu) -#include "tst_menu.moc" +#include "tst_qquickmenu.moc" |