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>

4 files changed, 767 insertions, 0 deletions

diff --git a/src/quicktemplates2/qquickaction.cpp b/src/quicktemplates2/qquickaction.cpp
new file mode 100644
index 00000000..dbe64121
--- /dev/null
+++ b/src/quicktemplates2/qquickaction.cpp
@@ -0,0 +1,523 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qquickaction_p.h"
+#include "qquickaction_p_p.h"
+#include "qquickshortcutcontext_p_p.h"
+#include "qquickicon_p.h"
+
+#include <QtGui/qevent.h>
+#include <QtGui/private/qshortcutmap_p.h>
+#include <QtGui/private/qguiapplication_p.h>
+#include <QtQuick/private/qquickitem_p.h>
+
+QT_BEGIN_NAMESPACE
+
+/*!
+    \qmltype Action
+    \inherits QtObject
+    \instantiates QQuickAction
+    \inqmlmodule QtQuick.Controls
+    \since 5.10
+    \ingroup utilities
+    \brief Abstract user interface action.
+
+    Action represents an abstract user interface action that can have shortcuts
+    and can be assigned to menu items and toolbar buttons.
+
+    Actions may contain \l text, an \l icon, and a \l shortcut. Actions are normally
+    \l triggered by the user via menu items, toolbar buttons, or keyboard shortcuts.
+    A \l checkable Action toggles its \l checked state when triggered.
+
+    \snippet qtquickcontrols2-action.qml action
+
+    Action is commonly used to implement application commands that can be invoked
+    via menu items, toolbar buttons, and keyboard shortcuts. Since the user expects
+    the commands to be performed in the same way, regardless of the user interface
+    used, it is useful to represent the commands as shareable actions.
+
+    Action can be also used to separate the logic and the visual presentation. For
+    example, when declaring buttons and menu items in \c .ui.qml files, actions can
+    be declared elsewhere and assigned from the outside.
+
+    \snippet qtquickcontrols2-action.qml toolbutton
+
+    When an action is paired with buttons and menu items, the \c enabled, \c checkable,
+    and \c checked states are synced automatically. For example, in a word processor,
+    if the user clicks a "Bold" toolbar button, the "Bold" menu item will automatically
+    be checked. Buttons and menu items get their \c text and \c icon from the action by
+    default. An action-specific \c text or \c icon can be overridden for a specific
+    control by specifying \c text or \c icon directly on the control.
+
+    \snippet qtquickcontrols2-action.qml menuitem
+
+    Since Action presents a user interface action, it is intended to be assigned to
+    a \l MenuItem, \l ToolButton, or any other control that inherits \l AbstractButton.
+    For keyboard shortcuts, the simpler \l Shortcut type is more appropriate.
+
+    \sa MenuItem, ToolButton, Shortcut
+*/
+
+/*!
+    \qmlsignal QtQuick.Controls::Action::toggled(QtObject source)
+
+    This signal is emitted when the action is toggled. The \a source argument
+    identifies the object that toggled the action.
+
+    For example, if the action is assigned to a menu item and a toolbar button, the
+    action is toggled when the control is toggled, the shortcut is activated, or
+    when \l toggle() is called directly.
+*/
+
+/*!
+    \qmlsignal QtQuick.Controls::Action::triggered(QtObject source)
+
+    This signal is emitted when the action is triggered. The \a source argument
+    identifies the object that triggered the action.
+
+    For example, if the action is assigned to a menu item and a toolbar button, the
+    action is triggered when the control is clicked, the shortcut is activated, or
+    when \l trigger() is called directly.
+*/
+
+static QKeySequence variantToKeySequence(const QVariant &var)
+{
+    if (var.type() == QVariant::Int)
+        return QKeySequence(static_cast<QKeySequence::StandardKey>(var.toInt()));
+    return QKeySequence::fromString(var.toString());
+}
+
+QQuickActionPrivate::ShortcutEntry::ShortcutEntry(QObject *target)
+    : m_shortcutId(0),
+      m_target(target)
+{
+}
+
+QQuickActionPrivate::ShortcutEntry::~ShortcutEntry()
+{
+    ungrab();
+}
+
+QObject *QQuickActionPrivate::ShortcutEntry::target() const
+{
+    return m_target;
+}
+
+int QQuickActionPrivate::ShortcutEntry::shortcutId() const
+{
+    return m_shortcutId;
+}
+
+void QQuickActionPrivate::ShortcutEntry::grab(const QKeySequence &shortcut, bool enabled)
+{
+    if (shortcut.isEmpty())
+        return;
+
+    Qt::ShortcutContext context = Qt::WindowShortcut; // TODO
+    m_shortcutId = QGuiApplicationPrivate::instance()->shortcutMap.addShortcut(m_target, shortcut, context, QQuickShortcutContext::matcher);
+
+    if (!enabled)
+        QGuiApplicationPrivate::instance()->shortcutMap.setShortcutEnabled(false, m_shortcutId, m_target);
+}
+
+void QQuickActionPrivate::ShortcutEntry::ungrab()
+{
+    if (!m_shortcutId)
+        return;
+
+    QGuiApplicationPrivate::instance()->shortcutMap.removeShortcut(m_shortcutId, m_target);
+    m_shortcutId = 0;
+}
+
+void QQuickActionPrivate::ShortcutEntry::setEnabled(bool enabled)
+{
+    if (!m_shortcutId)
+        return;
+
+    QGuiApplicationPrivate::instance()->shortcutMap.setShortcutEnabled(enabled, m_shortcutId, m_target);
+}
+
+QQuickActionPrivate::QQuickActionPrivate()
+    : enabled(true),
+      checked(false),
+      checkable(false),
+      icon(nullptr),
+      defaultShortcutEntry(nullptr)
+{
+}
+
+QVariant QQuickActionPrivate::shortcut() const
+{
+    return vshortcut;
+}
+
+void QQuickActionPrivate::setShortcut(const QVariant &var)
+{
+    Q_Q(QQuickAction);
+    if (vshortcut == var)
+        return;
+
+    defaultShortcutEntry->ungrab();
+    for (QQuickActionPrivate::ShortcutEntry *entry : qAsConst(shortcutEntries))
+        entry->ungrab();
+
+    vshortcut = var.toString();
+    keySequence = variantToKeySequence(var);
+
+    defaultShortcutEntry->grab(keySequence, enabled);
+    for (QQuickActionPrivate::ShortcutEntry *entry : qAsConst(shortcutEntries))
+        entry->grab(keySequence, enabled);
+
+    emit q->shortcutChanged(keySequence);
+}
+
+bool QQuickActionPrivate::watchItem(QQuickItem *item)
+{
+    Q_Q(QQuickAction);
+    if (!item)
+        return false;
+
+    item->installEventFilter(q);
+    QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Visibility | QQuickItemPrivate::Destroyed);
+    return true;
+}
+
+bool QQuickActionPrivate::unwatchItem(QQuickItem *item)
+{
+    Q_Q(QQuickAction);
+    if (!item)
+        return false;
+
+    item->removeEventFilter(q);
+    QQuickItemPrivate::get(item)->removeItemChangeListener(this, QQuickItemPrivate::Visibility | QQuickItemPrivate::Destroyed);
+    return true;
+}
+
+void QQuickActionPrivate::registerItem(QQuickItem *item)
+{
+    if (!watchItem(item))
+        return;
+
+    QQuickActionPrivate::ShortcutEntry *entry = new QQuickActionPrivate::ShortcutEntry(item);
+    if (item->isVisible())
+        entry->grab(keySequence, enabled);
+    shortcutEntries += entry;
+
+    updateDefaultShortcutEntry();
+}
+
+void QQuickActionPrivate::unregisterItem(QQuickItem *item)
+{
+    QQuickActionPrivate::ShortcutEntry *entry = findShortcutEntry(item);
+    if (!entry || !unwatchItem(item))
+        return;
+
+    shortcutEntries.removeOne(entry);
+    delete entry;
+
+    updateDefaultShortcutEntry();
+}
+
+void QQuickActionPrivate::itemVisibilityChanged(QQuickItem *item)
+{
+    QQuickActionPrivate::ShortcutEntry *entry = findShortcutEntry(item);
+    if (!entry)
+        return;
+
+    if (item->isVisible())
+        entry->grab(keySequence, enabled);
+    else
+        entry->ungrab();
+
+    updateDefaultShortcutEntry();
+}
+
+void QQuickActionPrivate::itemDestroyed(QQuickItem *item)
+{
+    unregisterItem(item);
+}
+
+bool QQuickActionPrivate::handleShortcutEvent(QObject *object, QShortcutEvent *event)
+{
+    Q_Q(QQuickAction);
+    if (event->key() != keySequence)
+        return false;
+
+    QQuickActionPrivate::ShortcutEntry *entry = findShortcutEntry(object);
+    if (!entry || event->shortcutId() != entry->shortcutId())
+        return false;
+
+    q->trigger(entry->target());
+    return true;
+}
+
+QQuickActionPrivate::ShortcutEntry *QQuickActionPrivate::findShortcutEntry(QObject *target) const
+{
+    Q_Q(const QQuickAction);
+    if (target == q)
+        return defaultShortcutEntry;
+    for (QQuickActionPrivate::ShortcutEntry *entry : shortcutEntries) {
+        if (entry->target() == target)
+            return entry;
+    }
+    return nullptr;
+}
+
+void QQuickActionPrivate::updateDefaultShortcutEntry()
+{
+    bool hasActiveShortcutEntries = false;
+    for (QQuickActionPrivate::ShortcutEntry *entry : qAsConst(shortcutEntries)) {
+        if (entry->shortcutId()) {
+            hasActiveShortcutEntries = true;
+            break;
+        }
+    }
+
+    if (hasActiveShortcutEntries)
+        defaultShortcutEntry->ungrab();
+    else if (!defaultShortcutEntry->shortcutId())
+        defaultShortcutEntry->grab(keySequence, enabled);
+}
+
+QQuickAction::QQuickAction(QObject *parent)
+    : QObject(*(new QQuickActionPrivate), parent)
+{
+    Q_D(QQuickAction);
+    d->defaultShortcutEntry = new QQuickActionPrivate::ShortcutEntry(this);
+}
+
+QQuickAction::~QQuickAction()
+{
+    Q_D(QQuickAction);
+    for (QQuickActionPrivate::ShortcutEntry *entry : qAsConst(d->shortcutEntries))
+        d->unwatchItem(qobject_cast<QQuickItem *>(entry->target()));
+
+    qDeleteAll(d->shortcutEntries);
+    delete d->defaultShortcutEntry;
+}
+
+/*!
+    \qmlproperty string QtQuick.Controls::Action::text
+
+    This property holds a textual description of the action.
+*/
+QString QQuickAction::text() const
+{
+    Q_D(const QQuickAction);
+    return d->text;
+}
+
+void QQuickAction::setText(const QString &text)
+{
+    Q_D(QQuickAction);
+    if (d->text == text)
+        return;
+
+    d->text = text;
+    emit textChanged(text);
+}
+
+/*!
+    \qmlpropertygroup QtQuick.Controls::Action::icon
+    \qmlproperty string QtQuick.Controls::Action::icon.name
+    \qmlproperty string QtQuick.Controls::Action::icon.source
+    \qmlproperty int QtQuick.Controls::Action::icon.width
+    \qmlproperty int QtQuick.Controls::Action::icon.height
+
+    \include qquickicon.qdocinc grouped-properties
+*/
+QQuickIcon *QQuickAction::icon() const
+{
+    QQuickActionPrivate *d = const_cast<QQuickActionPrivate *>(d_func());
+    if (!d->icon)
+        d->icon = new QQuickIcon(const_cast<QQuickAction *>(this));
+    return d->icon;
+}
+
+/*!
+    \qmlproperty bool QtQuick.Controls::Action::enabled
+
+    This property holds whether the action is enabled. The default value is \c true.
+*/
+bool QQuickAction::isEnabled() const
+{
+    Q_D(const QQuickAction);
+    return d->enabled;
+}
+
+void QQuickAction::setEnabled(bool enabled)
+{
+    Q_D(QQuickAction);
+    if (d->enabled == enabled)
+        return;
+
+    d->enabled = enabled;
+
+    d->defaultShortcutEntry->setEnabled(enabled);
+    for (QQuickActionPrivate::ShortcutEntry *entry : qAsConst(d->shortcutEntries))
+        entry->setEnabled(enabled);
+
+    emit enabledChanged(enabled);
+}
+
+/*!
+    \qmlproperty bool QtQuick.Controls::Action::checked
+
+    This property holds whether the action is checked.
+
+    \sa checkable
+*/
+bool QQuickAction::isChecked() const
+{
+    Q_D(const QQuickAction);
+    return d->checked;
+}
+
+void QQuickAction::setChecked(bool checked)
+{
+    Q_D(QQuickAction);
+    if (d->checked == checked)
+        return;
+
+    d->checked = checked;
+    emit checkedChanged(checked);
+}
+
+/*!
+    \qmlproperty bool QtQuick.Controls::Action::checkable
+
+    This property holds whether the action is checkable. The default value is \c false.
+
+    A checkable action toggles between checked (on) and unchecked (off) when triggered.
+
+    \sa checked
+*/
+bool QQuickAction::isCheckable() const
+{
+    Q_D(const QQuickAction);
+    return d->checkable;
+}
+
+void QQuickAction::setCheckable(bool checkable)
+{
+    Q_D(QQuickAction);
+    if (d->checkable == checkable)
+        return;
+
+    d->checkable = checkable;
+    emit checkableChanged(checkable);
+}
+
+/*!
+    \qmlproperty keysequence QtQuick.Controls::Action::shortcut
+
+    This property holds the action's shortcut. The key sequence can be set
+    to one of the \l{QKeySequence::StandardKey}{standard keyboard shortcuts},
+    or it can be described with a string containing a sequence of up to four
+    key presses that are needed to trigger the shortcut.
+
+    \code
+    Action {
+        sequence: "Ctrl+E,Ctrl+W"
+        onTriggered: edit.wrapMode = TextEdit.Wrap
+    }
+    \endcode
+*/
+QKeySequence QQuickAction::shortcut() const
+{
+    Q_D(const QQuickAction);
+    return d->keySequence;
+}
+
+void QQuickAction::setShortcut(const QKeySequence &shortcut)
+{
+    Q_D(QQuickAction);
+    d->setShortcut(shortcut.toString());
+}
+
+/*!
+    \qmlmethod void QtQuick.Controls::Action::toggle(QtObject source = null)
+
+    Toggles the action and emits \l toggled() if enabled, with an optional \a source object defined.
+*/
+void QQuickAction::toggle(QObject *source)
+{
+    Q_D(QQuickAction);
+    if (!d->enabled)
+        return;
+
+    if (d->checkable)
+        setChecked(!d->checked);
+
+    emit toggled(source);
+}
+
+/*!
+    \qmlmethod void QtQuick.Controls::Action::trigger(QtObject source = null)
+
+    Triggers the action and emits \l triggered() if enabled, with an optional \a source object defined.
+*/
+void QQuickAction::trigger(QObject *source)
+{
+    Q_D(QQuickAction);
+    if (!d->enabled)
+        return;
+
+    if (d->checkable)
+        toggle(source);
+
+    emit triggered(source);
+}
+
+bool QQuickAction::event(QEvent *event)
+{
+    Q_D(QQuickAction);
+    if (event->type() != QEvent::Shortcut)
+        return false;
+    return d->handleShortcutEvent(this, static_cast<QShortcutEvent *>(event));
+}
+
+bool QQuickAction::eventFilter(QObject *object, QEvent *event)
+{
+    Q_D(QQuickAction);
+    if (event->type() != QEvent::Shortcut)
+        return false;
+    return d->handleShortcutEvent(object, static_cast<QShortcutEvent *>(event));
+}
+
+QT_END_NAMESPACE
+
+#include "moc_qquickaction_p.cpp"
diff --git a/src/quicktemplates2/qquickaction_p.h b/src/quicktemplates2/qquickaction_p.h
new file mode 100644
index 00000000..3f16b4e7
--- /dev/null
+++ b/src/quicktemplates2/qquickaction_p.h
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKACTION_P_H
+#define QQUICKACTION_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtQuickTemplates2/private/qtquicktemplates2global_p.h>
+
+#include <QtCore/qobject.h>
+#include <QtQml/qqml.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQuickIcon;
+class QQuickActionPrivate;
+
+class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAction : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL)
+    Q_PROPERTY(QQuickIcon *icon READ icon CONSTANT FINAL)
+    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged FINAL)
+    Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged FINAL)
+    Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged FINAL)
+    Q_PRIVATE_PROPERTY(QQuickAction::d_func(), QVariant shortcut READ shortcut WRITE setShortcut NOTIFY shortcutChanged FINAL)
+
+public:
+    explicit QQuickAction(QObject *parent = nullptr);
+    ~QQuickAction();
+
+    QString text() const;
+    void setText(const QString &text);
+
+    QQuickIcon *icon() const;
+
+    bool isEnabled() const;
+    void setEnabled(bool enabled);
+
+    bool isChecked() const;
+    void setChecked(bool checked);
+
+    bool isCheckable() const;
+    void setCheckable(bool checkable);
+
+    QKeySequence shortcut() const;
+    void setShortcut(const QKeySequence &shortcut);
+
+public Q_SLOTS:
+    void toggle(QObject *source = nullptr);
+    void trigger(QObject *source = nullptr);
+
+Q_SIGNALS:
+    void textChanged(const QString &text);
+    void enabledChanged(bool enabled);
+    void checkedChanged(bool checked);
+    void checkableChanged(bool checkable);
+    void shortcutChanged(const QKeySequence &shortcut);
+
+    void toggled(QObject *source = nullptr);
+    void triggered(QObject *source = nullptr);
+
+protected:
+    bool event(QEvent *event) override;
+    bool eventFilter(QObject *object, QEvent *event) override;
+
+private:
+    Q_DISABLE_COPY(QQuickAction)
+    Q_DECLARE_PRIVATE(QQuickAction)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QQuickAction)
+
+#endif // QQUICKACTION_P_H
diff --git a/src/quicktemplates2/qquickaction_p_p.h b/src/quicktemplates2/qquickaction_p_p.h
new file mode 100644
index 00000000..4e1c89c2
--- /dev/null
+++ b/src/quicktemplates2/qquickaction_p_p.h
@@ -0,0 +1,123 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Quick Templates 2 module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKACTION_P_P_H
+#define QQUICKACTION_P_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/private/qobject_p.h>
+#include <QtCore/qvariant.h>
+#include <QtCore/qstring.h>
+#include <QtGui/qkeysequence.h>
+#include <QtQuick/private/qquickitemchangelistener_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQuickIcon;
+class QShortcutEvent;
+
+class QQuickActionPrivate : public QObjectPrivate, public QQuickItemChangeListener
+{
+    Q_DECLARE_PUBLIC(QQuickAction)
+
+public:
+    QQuickActionPrivate();
+
+    static QQuickActionPrivate *get(QQuickAction *action)
+    {
+        return action->d_func();
+    }
+
+    QVariant shortcut() const;
+    void setShortcut(const QVariant &shortcut);
+
+    bool watchItem(QQuickItem *item);
+    bool unwatchItem(QQuickItem *item);
+
+    void registerItem(QQuickItem *item);
+    void unregisterItem(QQuickItem *item);
+
+    void itemVisibilityChanged(QQuickItem *item) override;
+    void itemDestroyed(QQuickItem *item) override;
+
+    bool handleShortcutEvent(QObject *object, QShortcutEvent *event);
+
+    class ShortcutEntry
+    {
+    public:
+        explicit ShortcutEntry(QObject *target);
+        ~ShortcutEntry();
+
+        QObject *target() const;
+        int shortcutId() const;
+
+        void grab(const QKeySequence &vshortcut, bool enabled);
+        void ungrab();
+
+        void setEnabled(bool enabled);
+
+    private:
+        int m_shortcutId;
+        QObject *m_target;
+    };
+
+    ShortcutEntry *findShortcutEntry(QObject *target) const;
+    void updateDefaultShortcutEntry();
+
+    bool enabled;
+    bool checked;
+    bool checkable;
+    QString text;
+    QQuickIcon *icon;
+    QVariant vshortcut;
+    QKeySequence keySequence;
+    ShortcutEntry *defaultShortcutEntry;
+    QVector<ShortcutEntry *> shortcutEntries;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQUICKACTION_P_P_H
diff --git a/src/quicktemplates2/quicktemplates2.pri b/src/quicktemplates2/quicktemplates2.pri
index 232d1db0..b9f9a0b9 100644
--- a/src/quicktemplates2/quicktemplates2.pri
+++ b/src/quicktemplates2/quicktemplates2.pri
@@ -3,6 +3,7 @@ INCLUDEPATH += $$PWD
 HEADERS += \
     $$PWD/qquickabstractbutton_p.h \
     $$PWD/qquickabstractbutton_p_p.h \
+    $$PWD/qquickaction_p.h \
     $$PWD/qquickapplicationwindow_p.h \
     $$PWD/qquickbusyindicator_p.h \
     $$PWD/qquickbutton_p.h \
@@ -83,6 +84,7 @@ HEADERS += \
 
 SOURCES += \
     $$PWD/qquickabstractbutton.cpp \
+    $$PWD/qquickaction.cpp \
     $$PWD/qquickapplicationwindow.cpp \
     $$PWD/qquickbusyindicator.cpp \
     $$PWD/qquickbutton.cpp \