diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-03-02 11:41:51 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-04-10 10:58:59 +0000 |
| commit | 27850633dcf20ca2f89ef1491253b2d966a7af09 (patch) | |
| tree | 71a741006c4f0ed1d4f89e1c19294639b1900c21 /src/imports/controls/qtquickcontrols2plugin.cpp | |
| parent | 4aa35f5acabc352894a40310d378e6a97b92f59a (diff) | |
Add Action
[ChangeLog][Controls][Action] Introduced Action, an abstract user
interface action that can have shortcuts and be assigned to buttons.
Task-number: QTBUG-50705
Change-Id: I1986cc7ed13cdf428d51ae38cd196a20493fde8b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/qtquickcontrols2plugin.cpp')
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index bdace39a..19d2c6d7 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -47,6 +47,7 @@ #if QT_CONFIG(quick_listview) && QT_CONFIG(quick_pathview) #include <QtQuickControls2/private/qquicktumblerview_p.h> #endif +#include <QtQuickTemplates2/private/qquickaction_p.h> #include <QtQuickTemplates2/private/qquickbuttongroup_p.h> #include <QtQuickTemplates2/private/qquickicon_p.h> @@ -154,6 +155,7 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) qmlRegisterType(selector.select(QStringLiteral("ScrollView.qml")), uri, 2, 2, "ScrollView"); // QtQuick.Controls 2.3 (new types in Qt 5.10) + qmlRegisterType<QQuickAction>(uri, 2, 3, "Action"); qmlRegisterType<QQuickIcon>(); } |