From 8cc52b9d1e2638f0636f2817dffeccd623063718 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Tue, 12 Mar 2013 17:15:02 +0100 Subject: 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 --- src/controls/plugin.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/controls/plugin.cpp') diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp index 20d2f394..4ec08475 100644 --- a/src/controls/plugin.cpp +++ b/src/controls/plugin.cpp @@ -44,6 +44,7 @@ #include "qtexclusivegroup_p.h" #include "qtmenu_p.h" #include "qtmenubar_p.h" +#include "qtmenuitemcontainer_p.h" #include "qpagestatus.h" #include @@ -82,6 +83,7 @@ void StylePlugin::registerTypes(const char *uri) qmlRegisterType(uri, 1, 0, "MenuPrivate"); qmlRegisterType(uri, 1, 0, "MenuBarPrivate"); qmlRegisterType(uri, 1, 0, "MenuItem"); + qmlRegisterType(uri, 1, 0, "MenuItemContainer"); qmlRegisterType(uri, 1, 0, "MenuSeparator"); qmlRegisterUncreatableType(uri, 1, 0, "MenuBase", QLatin1String("Do not create objects of type MenuBase")); -- cgit v1.2.1