aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qmltest
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-12-01 13:24:14 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-08 14:12:39 +0000
commit967797002f80665dac8b41509c44b6467229f02c (patch)
tree33cb8317719d41f444acdcd4264bcfaba2d1df83 /tests/auto/qmltest
parentb7d55fa38441afa431481dd5c8d0aa2ff5f2c2cf (diff)
Blacklist qmltest ShortCut::test_shortcut()
Task-number: QTBUG-64914 Change-Id: Iafced31ed5ce61247f7514d86155860925cb434c Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/qmltest')
-rw-r--r--tests/auto/qmltest/qmltest.pro1
-rw-r--r--tests/auto/qmltest/shortcut/shortcut.pro1
-rw-r--r--tests/auto/qmltest/shortcut/tst_shortcut.qml58
3 files changed, 0 insertions, 60 deletions
diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
index 45f240e1d1..8ad1541cbc 100644
--- a/tests/auto/qmltest/qmltest.pro
+++ b/tests/auto/qmltest/qmltest.pro
@@ -22,7 +22,6 @@ SUBDIRS += \
rectangle \
selftests \
shadersource \
- shortcut \
stability \
statemachine \
text \
diff --git a/tests/auto/qmltest/shortcut/shortcut.pro b/tests/auto/qmltest/shortcut/shortcut.pro
deleted file mode 100644
index a7938e7003..0000000000
--- a/tests/auto/qmltest/shortcut/shortcut.pro
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG += qmltestcase
diff --git a/tests/auto/qmltest/shortcut/tst_shortcut.qml b/tests/auto/qmltest/shortcut/tst_shortcut.qml
deleted file mode 100644
index bc433761e2..0000000000
--- a/tests/auto/qmltest/shortcut/tst_shortcut.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** 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$
-**
-****************************************************************************/
-
-import QtQuick 2.8
-import QtQuick.Window 2.2
-import QtTest 1.2
-
-TestCase {
- name: "ShortCut"
- when: windowShown
-
- Shortcut {
- id: shortcut
- property bool everActivated: false
- sequence: StandardKey.NextChild
- onActivated: everActivated = true
- }
-
- Shortcut {
- id: shortcut2
- property bool everActivated: false
- sequence: "Ctrl+E,Ctrl+W"
- onActivated: everActivated = true
- }
-
- function test_shortcut() {
- keySequence(StandardKey.NextChild)
- verify(shortcut.everActivated);
-
- keySequence("Ctrl+E,Ctrl+W")
- verify(shortcut2.everActivated);
- }
-}