diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-06-18 11:38:40 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2018-06-25 13:51:16 +0000 |
| commit | 38f8d09676717035382629f877d2e68ce5c54b83 (patch) | |
| tree | 911008ee366fca4261ad1809efed97f723bdbe7a /tests/auto/qquickmenu/tst_qquickmenu.cpp | |
| parent | 020b80eef2c3c1175d33fa24cf154c5de54c87d7 (diff) | |
Menu: fix items not being scrollable when using Window
Use Window.window instead of ApplicationWindow.window, as the former
will always result in a window regardless of which type of window is
in use.
Task-number: QTBUG-68858
Change-Id: I3bdb60350d92b13621b0f4db9085bf067b6ff6e2
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'tests/auto/qquickmenu/tst_qquickmenu.cpp')
| -rw-r--r-- | tests/auto/qquickmenu/tst_qquickmenu.cpp | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/tests/auto/qquickmenu/tst_qquickmenu.cpp b/tests/auto/qquickmenu/tst_qquickmenu.cpp index 1202072b..5a676c03 100644 --- a/tests/auto/qquickmenu/tst_qquickmenu.cpp +++ b/tests/auto/qquickmenu/tst_qquickmenu.cpp @@ -84,6 +84,8 @@ private slots: void subMenuPosition_data(); void subMenuPosition(); void addRemoveSubMenus(); + void scrollable_data(); + void scrollable(); }; void tst_QQuickMenu::defaults() @@ -1309,6 +1311,31 @@ void tst_QQuickMenu::addRemoveSubMenus() QVERIFY(subSubMenu1Item.isNull()); } +void tst_QQuickMenu::scrollable_data() +{ + QTest::addColumn<QString>("qmlFilePath"); + + QTest::addRow("Window") << QString::fromLatin1("windowScrollable.qml"); + QTest::addRow("ApplicationWindow") << QString::fromLatin1("applicationWindowScrollable.qml"); +} + +void tst_QQuickMenu::scrollable() +{ + QFETCH(QString, qmlFilePath); + + QQuickApplicationHelper helper(this, qmlFilePath); + QQuickWindow *window = helper.window; + window->show(); + QVERIFY(QTest::qWaitForWindowActive(window)); + + QQuickMenu *menu = window->property("menu").value<QQuickMenu*>(); + menu->open(); + QVERIFY(menu->isVisible()); + + QQuickItem *contentItem = menu->contentItem(); + QCOMPARE(contentItem->property("interactive").toBool(), true); +} + QTEST_MAIN(tst_QQuickMenu) #include "tst_qquickmenu.moc" |