diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:41 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:41 +0200 |
| commit | 72f320a266d7f6e8055fdb57d0996363fcbc027a (patch) | |
| tree | aa4944c3d78267aa1d44b92605bbb0e475546d20 /src/quick/handlers | |
| parent | a85ff0f11cce53244085cab8d947325099015725 (diff) | |
| parent | e41b519cfa8c9932b88db35b2d72588a13f19e4d (diff) | |
Merge dev into 5.10
Change-Id: I4376b711fbf02ea978f5d347d34a4a6a0c95dab2
Diffstat (limited to 'src/quick/handlers')
| -rw-r--r-- | src/quick/handlers/qquicktaphandler.cpp | 2 | ||||
| -rw-r--r-- | src/quick/handlers/qquicktaphandler_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/handlers/qquicktaphandler.cpp b/src/quick/handlers/qquicktaphandler.cpp index 04c69e9c06..8b6519b4ba 100644 --- a/src/quick/handlers/qquicktaphandler.cpp +++ b/src/quick/handlers/qquicktaphandler.cpp @@ -287,7 +287,7 @@ void QQuickTapHandler::setPressed(bool press, bool cancel, QQuickEventPoint *poi else m_tapCount = 1; qCDebug(lcTapHandler) << objectName() << "tapped" << m_tapCount << "times"; - emit tapped(point); + emit tapped(); emit tapCountChanged(); m_lastTapTimestamp = ts; m_lastTapPos = point->scenePos(); diff --git a/src/quick/handlers/qquicktaphandler_p.h b/src/quick/handlers/qquicktaphandler_p.h index 0e9a6f0411..433d2138ea 100644 --- a/src/quick/handlers/qquicktaphandler_p.h +++ b/src/quick/handlers/qquicktaphandler_p.h @@ -95,7 +95,7 @@ Q_SIGNALS: void timeHeldChanged(); void longPressThresholdChanged(); void gesturePolicyChanged(); - void tapped(QQuickEventPoint *point); + void tapped(); void longPressed(); protected: |