summaryrefslogtreecommitdiff
path: root/src/controls/qmldir
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2013-03-12 17:15:02 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-13 15:33:53 +0100
commit8cc52b9d1e2638f0636f2817dffeccd623063718 (patch)
tree0498fe65c48bbd4383b68315cecc4ec4efe6cb47 /src/controls/qmldir
parent15c57038d9ac4720f4bc4b476d978a3824ed71ab (diff)
downloadqtquickcontrols-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 'src/controls/qmldir')
-rw-r--r--src/controls/qmldir1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/controls/qmldir b/src/controls/qmldir
index 23b65844..377b55ee 100644
--- a/src/controls/qmldir
+++ b/src/controls/qmldir
@@ -4,7 +4,6 @@ ApplicationWindow 1.0 ApplicationWindow.qml
Button 1.0 Button.qml
CheckBox 1.0 CheckBox.qml
ComboBox 1.0 ComboBox.qml
-ContextMenu 1.0 ContextMenu.qml
GroupBox 1.0 GroupBox.qml
Label 1.0 Label.qml
MenuBar 1.0 MenuBar.qml