4 files changed, 11 insertions, 24 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index 2100dce2..44d1da25 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -630,6 +630,14 @@ void QQuickAbstractButton::setAutoExclusive(bool exclusive)
     emit autoExclusiveChanged();
 }
 
+/*!
+    \qmlproperty bool QtQuick.Controls::AbstractButton::autoRepeat
+
+    This property holds whether the button repeats \l pressed(), \l released()
+    and \l clicked() signals while the button is pressed and held down.
+
+    The default value is \c false.
+*/
 bool QQuickAbstractButton::autoRepeat() const
 {
     Q_D(const QQuickAbstractButton);
@@ -644,7 +652,7 @@ void QQuickAbstractButton::setAutoRepeat(bool repeat)
 
     d->stopPressRepeat();
     d->autoRepeat = repeat;
-    buttonChange(ButtonAutoRepeatChange);
+    emit autoRepeatChanged();
 }
 
 /*!
diff --git a/src/quicktemplates2/qquickabstractbutton_p.h b/src/quicktemplates2/qquickabstractbutton_p.h
index 81384298..4d192ae7 100644
--- a/src/quicktemplates2/qquickabstractbutton_p.h
+++ b/src/quicktemplates2/qquickabstractbutton_p.h
@@ -65,6 +65,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAbstractButton : public QQuickContr
     Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged FINAL)
     Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged FINAL)
     Q_PROPERTY(bool autoExclusive READ autoExclusive WRITE setAutoExclusive NOTIFY autoExclusiveChanged FINAL)
+    Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat NOTIFY autoRepeatChanged FINAL)
     Q_PROPERTY(QQuickItem *indicator READ indicator WRITE setIndicator NOTIFY indicatorChanged FINAL)
     Q_PROPERTY(QQuickIcon icon READ icon WRITE setIcon NOTIFY iconChanged FINAL REVISION 3)
     Q_PROPERTY(Display display READ display WRITE setDisplay NOTIFY displayChanged FINAL REVISION 3)
@@ -138,6 +139,7 @@ Q_SIGNALS:
     void checkedChanged();
     void checkableChanged();
     void autoExclusiveChanged();
+    void autoRepeatChanged();
     void indicatorChanged();
     Q_REVISION(3) void iconChanged();
     Q_REVISION(3) void displayChanged();
@@ -157,7 +159,6 @@ protected:
     void itemChange(ItemChange change, const ItemChangeData &value) override;
 
     enum ButtonChange {
-        ButtonAutoRepeatChange,
         ButtonCheckedChange,
         ButtonCheckableChange,
         ButtonPressedChanged,
diff --git a/src/quicktemplates2/qquickbutton.cpp b/src/quicktemplates2/qquickbutton.cpp
index b5a8ac1c..adbc48fd 100644
--- a/src/quicktemplates2/qquickbutton.cpp
+++ b/src/quicktemplates2/qquickbutton.cpp
@@ -99,24 +99,6 @@ QQuickButton::QQuickButton(QQuickButtonPrivate &dd, QQuickItem *parent)
 {
 }
 
-/*!
-    \qmlproperty bool QtQuick.Controls::Button::autoRepeat
-
-    This property holds whether the button repeats
-    \l {AbstractButton::}{pressed()}, \l {AbstractButton::}{released()}
-    and \l {AbstractButton::}{clicked()} signals while the button is pressed
-    and held down.
-
-    The default value is \c false.
-*/
-
-void QQuickButton::buttonChange(ButtonChange change)
-{
-    QQuickAbstractButton::buttonChange(change);
-    if (change == ButtonAutoRepeatChange)
-        emit autoRepeatChanged();
-}
-
 QFont QQuickButton::defaultFont() const
 {
     return QQuickControlPrivate::themeFont(QPlatformTheme::PushButtonFont);
diff --git a/src/quicktemplates2/qquickbutton_p.h b/src/quicktemplates2/qquickbutton_p.h
index f1a34b10..a77db16e 100644
--- a/src/quicktemplates2/qquickbutton_p.h
+++ b/src/quicktemplates2/qquickbutton_p.h
@@ -57,7 +57,6 @@ class QQuickButtonPrivate;
 class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickButton : public QQuickAbstractButton
 {
     Q_OBJECT
-    Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat NOTIFY autoRepeatChanged FINAL)
     Q_PROPERTY(bool highlighted READ isHighlighted WRITE setHighlighted NOTIFY highlightedChanged FINAL)
     Q_PROPERTY(bool flat READ isFlat WRITE setFlat NOTIFY flatChanged FINAL)
 
@@ -71,15 +70,12 @@ public:
     void setFlat(bool flat);
 
 Q_SIGNALS:
-    void autoRepeatChanged();
     void highlightedChanged();
     void flatChanged();
 
 protected:
     QQuickButton(QQuickButtonPrivate &dd, QQuickItem *parent);
 
-    void buttonChange(ButtonChange change) override;
-
     QFont defaultFont() const override;
     QPalette defaultPalette() const override;