summaryrefslogtreecommitdiff
path: root/tests/auto
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-20 22:42:51 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-20 22:43:24 +0100
commit4459886e3f949821425dd5fd9fc9da0416d0ffc9 (patch)
tree4f456505c2bee66ea49ced2b4d69a2c1b1430c3b /tests/auto
parentc053e8aa063fa679b712935cc1495a51f2ddaf6b (diff)
parent698a8268f786d74726eb07255df2d26ac2269079 (diff)
downloadqtquickcontrols-4459886e3f949821425dd5fd9fc9da0416d0ffc9.tar.gz
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts: .qmake.conf Change-Id: Id56429b283aff90a18576cbd769b96fa1f0781fa
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/controls/data/tst_treeview.qml18
1 files changed, 0 insertions, 18 deletions
diff --git a/tests/auto/controls/data/tst_treeview.qml b/tests/auto/controls/data/tst_treeview.qml
index dad10a6b..b46d4dc2 100644
--- a/tests/auto/controls/data/tst_treeview.qml
+++ b/tests/auto/controls/data/tst_treeview.qml
@@ -114,8 +114,6 @@ Item {
function test_clicked_signals()
{
- if (Settings.hasTouchScreen)
- skip("Fails with touch screens");
var component = Qt.createComponent("treeview/treeview_1.qml")
compare(component.status, Component.Ready)
var tree = component.createObject(container);
@@ -165,8 +163,6 @@ Item {
function test_headerHidden()
{
- if (Settings.hasTouchScreen)
- skip("Fails with touch screens");
var component = Qt.createComponent("treeview/treeview_1.qml")
compare(component.status, Component.Ready)
var tree = component.createObject(container);
@@ -282,8 +278,6 @@ Item {
function test_keys_navigation()
{
- if (Settings.hasTouchScreen)
- skip("Fails with touch screens");
var component = Qt.createComponent("treeview/treeview_2.qml")
compare(component.status, Component.Ready)
var tree = component.createObject(container);
@@ -338,8 +332,6 @@ Item {
function test_selection_singleSelection()
{
- if (Settings.hasTouchScreen)
- skip("Fails with touch screens");
var component = Qt.createComponent("treeview/treeview_1.qml")
compare(component.status, Component.Ready)
var tree = component.createObject(container);
@@ -465,8 +457,6 @@ Item {
function test_selection_multiSelection()
{
- if (Settings.hasTouchScreen)
- skip("Fails with touch screens");
var component = Qt.createComponent("treeview/treeview_1.qml")
compare(component.status, Component.Ready)
var tree = component.createObject(container);
@@ -576,8 +566,6 @@ Item {
function test_selection_extendedSelection()
{
- if (Settings.hasTouchScreen)
- skip("Fails with touch screens");
var component = Qt.createComponent("treeview/treeview_1.qml")
compare(component.status, Component.Ready)
var tree = component.createObject(container);
@@ -664,8 +652,6 @@ Item {
function test_selection_contiguousSelection()
{
- if (Settings.hasTouchScreen)
- skip("Fails with touch screens");
var component = Qt.createComponent("treeview/treeview_1.qml")
compare(component.status, Component.Ready)
var tree = component.createObject(container);
@@ -762,8 +748,6 @@ Item {
function test_indexAt() {
skip("Fails because of bug QTBUG-47523")
- if (Settings.hasTouchScreen)
- skip("Fails with touch screens");
var component = Qt.createComponent("treeview/treeview_1.qml")
compare(component.status, Component.Ready)
var tree = component.createObject(container);
@@ -832,8 +816,6 @@ Item {
function test_QTBUG_46891_selection_collapse_parent()
{
- if (Settings.hasTouchScreen)
- skip("Fails with touch screens");
var component = Qt.createComponent("treeview/treeview_1.qml")
compare(component.status, Component.Ready)
var tree = component.createObject(container);