Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	src/imports/controls/RoundButton.qml
	src/imports/controls/universal/RadioDelegate.qml

Change-Id: I4cb14c19bd5f6e19b70b03fb394c76712e6dda08

1 files changed, 5 insertions, 6 deletions

diff --git a/src/quicktemplates2/qquickabstractbutton_p_p.h b/src/quicktemplates2/qquickabstractbutton_p_p.h
index 41eb72c1..61a546d1 100644
--- a/src/quicktemplates2/qquickabstractbutton_p_p.h
+++ b/src/quicktemplates2/qquickabstractbutton_p_p.h
@@ -69,10 +69,10 @@ public:
         return button->d_func();
     }
 
-    virtual void handlePress(const QPointF &point, Qt::MouseButton button = Qt::LeftButton, Qt::MouseButtons buttons = Qt::LeftButton);
-    virtual void handleMove(const QPointF &point);
-    virtual void handleRelease(const QPointF &point);
-    virtual void handleCancel();
+    void handlePress(const QPointF &point) override;
+    void handleMove(const QPointF &point) override;
+    void handleRelease(const QPointF &point) override;
+    void handleUngrab() override;
 
     bool isPressAndHoldConnected();
     void startPressAndHold();
@@ -99,12 +99,11 @@ public:
     bool autoExclusive;
     bool autoRepeat;
     bool wasHeld;
-    int touchId;
     int holdTimer;
     int delayTimer;
     int repeatTimer;
     QPointF pressPoint;
-    Qt::MouseButton repeatButton;
+    Qt::MouseButtons pressButtons;
     QQuickItem *indicator;
     QQuickButtonGroup *group;
     QQuickIcon *icon;