Move highlighted to subclasses that actually use it

Change-Id: I70468b35b2a3a03c6e2d557a67443291697c8b42
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

1 files changed, 42 insertions, 1 deletions

diff --git a/src/quicktemplates2/qquickmenuitem.cpp b/src/quicktemplates2/qquickmenuitem.cpp
index d9740910..7c9ede7d 100644
--- a/src/quicktemplates2/qquickmenuitem.cpp
+++ b/src/quicktemplates2/qquickmenuitem.cpp
@@ -78,6 +78,21 @@ QT_BEGIN_NAMESPACE
     \sa {Customizing MenuItem}, {Menu Controls}
 */
 
+class QQuickMenuItemPrivate : public QQuickAbstractButtonPrivate
+{
+    Q_DECLARE_PUBLIC(QQuickMenuItem)
+
+public:
+    QQuickMenuItemPrivate();
+
+    bool highlighted;
+};
+
+QQuickMenuItemPrivate::QQuickMenuItemPrivate() :
+    highlighted(false)
+{
+}
+
 /*!
     \qmlsignal void QtQuick.Controls::MenuItem::triggered()
 
@@ -85,7 +100,7 @@ QT_BEGIN_NAMESPACE
 */
 
 QQuickMenuItem::QQuickMenuItem(QQuickItem *parent) :
-    QQuickAbstractButton(parent)
+    QQuickAbstractButton(*(new QQuickMenuItemPrivate), parent)
 {
     connect(this, &QQuickAbstractButton::clicked, this, &QQuickMenuItem::triggered);
 }
@@ -106,6 +121,32 @@ QFont QQuickMenuItem::defaultFont() const
     return QQuickControlPrivate::themeFont(QPlatformTheme::MenuItemFont);
 }
 
+/*!
+    \qmlproperty bool QtQuick.Controls::MenuItem::highlighted
+
+    This property holds whether the menu item is highlighted.
+
+    A menu item can be highlighted in order to draw the user's attention
+    towards it. It has no effect on keyboard interaction.
+
+    The default value is \c false.
+*/
+bool QQuickMenuItem::isHighlighted() const
+{
+    Q_D(const QQuickMenuItem);
+    return d->highlighted;
+}
+
+void QQuickMenuItem::setHighlighted(bool highlighted)
+{
+    Q_D(QQuickMenuItem);
+    if (highlighted == d->highlighted)
+        return;
+
+    d->highlighted = highlighted;
+    emit highlightedChanged();
+}
+
 #ifndef QT_NO_ACCESSIBILITY
 QAccessible::Role QQuickMenuItem::accessibleRole() const
 {