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 /src/controls/plugin.cpp | |
| 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 'src/controls/plugin.cpp')
| -rw-r--r-- | src/controls/plugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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 <qimage.h> @@ -82,6 +83,7 @@ void StylePlugin::registerTypes(const char *uri) qmlRegisterType<QtMenu>(uri, 1, 0, "MenuPrivate"); qmlRegisterType<QtMenuBar>(uri, 1, 0, "MenuBarPrivate"); qmlRegisterType<QtMenuItem>(uri, 1, 0, "MenuItem"); + qmlRegisterType<QtMenuItemContainer>(uri, 1, 0, "MenuItemContainer"); qmlRegisterType<QtMenuSeparator>(uri, 1, 0, "MenuSeparator"); qmlRegisterUncreatableType<QtMenuBase>(uri, 1, 0, "MenuBase", QLatin1String("Do not create objects of type MenuBase")); |