1 files changed, 17 insertions, 29 deletions
diff --git a/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml b/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml
index 800c25c77d..fc1e623902 100644
--- a/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml
+++ b/tests/auto/quick/pointerhandlers/qquicktaphandler/data/Button.qml
@@ -1,30 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3 as published by the Free Software
-** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2017 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 import QtQuick 2.12
 
@@ -35,13 +10,20 @@ Rectangle {
     property alias pressed: tap.pressed
     property bool checked: false
     property alias gesturePolicy: tap.gesturePolicy
+    property alias longPressThreshold: tap.longPressThreshold
     property point tappedPosition: Qt.point(0, 0)
+    property real timeHeldWhenTapped: 0
+    property real timeHeldWhenLongPressed: 0
     signal tapped
     signal canceled
 
     width: label.implicitWidth * 1.5; height: label.implicitHeight * 2.0
     border.color: "#9f9d9a"; border.width: 1; radius: height / 4; antialiasing: true
 
+    function assignUndefinedLongPressThreshold() {
+        tap.longPressThreshold = undefined
+    }
+
     gradient: Gradient {
         GradientStop { position: 0.0; color: tap.pressed ? "#b8b5b2" : "#efebe7" }
         GradientStop { position: 1.0; color: "#b8b5b2" }
@@ -50,11 +32,17 @@ Rectangle {
     TapHandler {
         id: tap
         objectName: label.text
-        longPressThreshold: 100 // CI can be insanely slow, so don't demand a timely release to generate onTapped
-        onTapped: {
+        onSingleTapped: console.log("Single tap")
+        onDoubleTapped: console.log("Double tap")
+        onTapped: (eventPoint, button) => {
+            console.log("Tapped", button, eventPoint)
             tapFlash.start()
             root.tappedPosition = point.scenePosition
             root.tapped()
+            root.timeHeldWhenTapped = tap.timeHeld // eventPoint.timeHeld is already 0
+        }
+        onLongPressed: {
+            root.timeHeldWhenLongPressed = tap.timeHeld
         }
         onCanceled: root.canceled()
     }