diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-03-12 17:15:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-13 15:33:53 +0100 |
| commit | 8cc52b9d1e2638f0636f2817dffeccd623063718 (patch) | |
| tree | 0498fe65c48bbd4383b68315cecc4ec4efe6cb47 /tests/auto/controls/data/tst_menu.qml | |
| parent | 15c57038d9ac4720f4bc4b476d978a3824ed71ab (diff) | |
| download | qtquickcontrols-8cc52b9d1e2638f0636f2817dffeccd623063718.tar.gz | |
Menu: Remove 'model' property, ContextMenu
In the near future, we hope that QML types like Creator/Instantiator
(currently under review) will help simplify model binding, and object
creation and deletion. Also, given the differences between QML models
and QAbstractItemModel APIs, it's hard to provide a unified and
elegant solution for this right now.
ComboBox gets the part of the logic that ContextMenu was responsible
for, extended to support string list and number models. Auto-tests
updated and XFAIL removed where applicable.
Change-Id: I9f5d4059644c495bffff76fb7c353e6fe7fde62e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'tests/auto/controls/data/tst_menu.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_menu.qml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/controls/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml index 66aa8f09..9884d466 100644 --- a/tests/auto/controls/data/tst_menu.qml +++ b/tests/auto/controls/data/tst_menu.qml @@ -95,10 +95,11 @@ TestCase { id: modelCreationComponent // TODO Update when model patch is in // Menu { MenuItemRepeater { model: testcase.itemsText MenuItem { text: modelData } } - ContextMenu { model: testcase.itemsText } + Menu {} } function test_modelCreation() { + testcase.skip("No support for model in Menu. It'll come back") var menu = modelCreationComponent.createObject(testcase) compare(menu.items.length, testcase.itemsText.length) for (var i = 0; i < menu.items.length; i++) |