Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl

Change-Id: I09434c9f6ff3112e4a8abe1bdf6036d789dfaabf

1 files changed, 30 insertions, 5 deletions

diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index 950e4e09..20cf59c1 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -215,8 +215,20 @@ bool QQuickAbstractButtonPrivate::acceptKeyClick(Qt::Key key) const
 bool QQuickAbstractButtonPrivate::isPressAndHoldConnected()
 {
     Q_Q(QQuickAbstractButton);
-    const auto signal = &QQuickAbstractButton::pressAndHold;
-    const QMetaMethod method = QMetaMethod::fromSignal(signal);
+    static const QMetaMethod method = [&]() {
+        const auto signal = &QQuickAbstractButton::pressAndHold;
+        return QMetaMethod::fromSignal(signal);
+    }();
+    return q->isSignalConnected(method);
+}
+
+bool QQuickAbstractButtonPrivate::isDoubleClickConnected()
+{
+    Q_Q(QQuickAbstractButton);
+    static const QMetaMethod method = [&]() {
+        const auto signal = &QQuickAbstractButton::doubleClicked;
+        return QMetaMethod::fromSignal(signal);
+    }();
     return q->isSignalConnected(method);
 }
 
@@ -387,6 +399,17 @@ void QQuickAbstractButtonPrivate::itemImplicitHeightChanged(QQuickItem *item)
         emit q->implicitIndicatorHeightChanged();
 }
 
+void QQuickAbstractButtonPrivate::itemDestroyed(QQuickItem *item)
+{
+    Q_Q(QQuickAbstractButton);
+    QQuickControlPrivate::itemDestroyed(item);
+    if (item == indicator) {
+        indicator = nullptr;
+        emit q->implicitIndicatorWidthChanged();
+        emit q->implicitIndicatorHeightChanged();
+    }
+}
+
 QQuickAbstractButton *QQuickAbstractButtonPrivate::findCheckedButton() const
 {
     Q_Q(const QQuickAbstractButton);
@@ -1086,9 +1109,11 @@ void QQuickAbstractButton::mousePressEvent(QMouseEvent *event)
 void QQuickAbstractButton::mouseDoubleClickEvent(QMouseEvent *event)
 {
     Q_D(QQuickAbstractButton);
-    QQuickControl::mouseDoubleClickEvent(event);
-    emit doubleClicked();
-    d->wasDoubleClick = true;
+    if (d->isDoubleClickConnected()) {
+        QQuickControl::mouseDoubleClickEvent(event);
+        emit doubleClicked();
+        d->wasDoubleClick = true;
+    }
 }
 
 void QQuickAbstractButton::timerEvent(QTimerEvent *event)