aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickabstractbutton.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-02 03:03:32 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-02-02 03:03:32 +0100
commit3afec43b69991753416380d88e22b5382b8b0832 (patch)
tree15f14aa78ba2a9cc8c118665318e9e5b77282d8b /src/quicktemplates2/qquickabstractbutton.cpp
parent1a89fbc5a8e9fe6b2711c2e87e9909201c26d499 (diff)
parent09181d8b61cf3c84c88258586d68bd721d440620 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1
Diffstat (limited to 'src/quicktemplates2/qquickabstractbutton.cpp')
-rw-r--r--src/quicktemplates2/qquickabstractbutton.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp
index c0ce6978..9157b4f9 100644
--- a/src/quicktemplates2/qquickabstractbutton.cpp
+++ b/src/quicktemplates2/qquickabstractbutton.cpp
@@ -204,7 +204,9 @@ void QQuickAbstractButtonPrivate::handleUngrab()
bool QQuickAbstractButtonPrivate::isPressAndHoldConnected()
{
Q_Q(QQuickAbstractButton);
- IS_SIGNAL_CONNECTED(q, QQuickAbstractButton, pressAndHold, ());
+ const auto signal = &QQuickAbstractButton::pressAndHold;
+ const QMetaMethod method = QMetaMethod::fromSignal(signal);
+ return q->isSignalConnected(method);
}
void QQuickAbstractButtonPrivate::startPressAndHold()