diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-06-03 10:16:42 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-26 14:11:39 +0000 |
| commit | 66faa149db5d7b0a31db98b792c5202b8f33bf8a (patch) | |
| tree | 4f757ec3ddfe6ab344269c43aa9ae44200df2a98 /src/imports/templates | |
| parent | 9484e471324560ffd189ed7bd59ac182f0793b31 (diff) | |
Introduce MenuBar
MenuBar is an ordinary Item. It can be located basically anywhere, but
the idea is to introduce a new ApplicationWindow::menuBar property in a
follow-up commit. Currently the example snippets are using the header
property.
[ChangeLog][Controls][MenuBar] Introduced a MenuBar control.
Task-number: QTBUG-60350
Change-Id: Ie66dc457a3d8edbe8362fab2a591dc49442c95e2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/templates')
| -rw-r--r-- | src/imports/templates/qtquicktemplates2plugin.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index 2ce655c3..a8aafa2c 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -60,6 +60,8 @@ #include <QtQuickTemplates2/private/qquickitemdelegate_p.h> #include <QtQuickTemplates2/private/qquicklabel_p.h> #include <QtQuickTemplates2/private/qquickmenu_p.h> +#include <QtQuickTemplates2/private/qquickmenubar_p.h> +#include <QtQuickTemplates2/private/qquickmenubaritem_p.h> #include <QtQuickTemplates2/private/qquickmenuitem_p.h> #include <QtQuickTemplates2/private/qquickmenuseparator_p.h> #include <QtQuickTemplates2/private/qquickoverlay_p.h> @@ -300,6 +302,8 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterType<QQuickDialogButtonBox>(uri, 2, 3, "DialogButtonBox"); qRegisterMetaType<QQuickIcon>(); qmlRegisterType<QQuickMenu, 3>(uri, 2, 3, "Menu"); + qmlRegisterType<QQuickMenuBar>(uri, 2, 3, "MenuBar"); + qmlRegisterType<QQuickMenuBarItem>(uri, 2, 3, "MenuBarItem"); qmlRegisterType<QQuickMenuItem, 3>(uri, 2, 3, "MenuItem"); qmlRegisterUncreatableType<QQuickOverlay>(uri, 2, 3, "Overlay", QStringLiteral("Overlay is only available as an attached property.")); qmlRegisterType<QQuickOverlayAttached>(); |