diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-27 01:00:05 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-27 01:00:06 +0200 |
commit | 1c06ff9cac74964f60615d040f013d8eb852e17d (patch) | |
tree | 50a00da08df6f1f6fd781313828514e47bdeeafe /tests/manual/pointer | |
parent | 1da49d8493de7180a9db38d4614ba6fbbe898276 (diff) | |
parent | a0ad2cbdf27d0d23727b09609e127ac17e414a22 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I73d9e896c05f7d944f3092b51a3a95c7e6e284b8
Diffstat (limited to 'tests/manual/pointer')
-rw-r--r-- | tests/manual/pointer/tapWithModifiers.qml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tests/manual/pointer/tapWithModifiers.qml b/tests/manual/pointer/tapWithModifiers.qml index 8ca1c1bd63..da3c0cb30a 100644 --- a/tests/manual/pointer/tapWithModifiers.qml +++ b/tests/manual/pointer/tapWithModifiers.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the manual tests of the Qt Toolkit. @@ -40,6 +40,16 @@ Item { onTapped: console.log("tapped with no modifiers") } TapHandler { - onTapped: console.log("tapped with modifiers " + point.event.modifiers) + onTapped: + switch (point.modifiers) { + case Qt.ControlModifier | Qt.AltModifier: + console.log("CTRL+ALT"); + break; + case Qt.ControlModifier | Qt.AltModifier | Qt.MetaModifier: + console.log("CTRL+META+ALT"); + break; + default: + console.log("other modifiers", point.modifiers) + } } } |