Skip controls tests when touch screen is present.

Task-number: QTBUG-49359
Task-number: QTBUG-49360
Change-Id: I96ec6d46de189ec396ef26c0d059c65360da4ec0
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

3 files changed, 30 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index 1589f2ab..83ba299e 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -280,6 +280,8 @@ Item {
         }
 
         function test_sliderOffset() {
+            if (Settings.hasTouchScreen)
+                skip("Fails with touch screens");
             var control = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {x: 20; y: 20; width: 100; height: 50}', container, '')
             // Don't move slider value if mouse is inside handle regtion
             mouseMove(control, control.width/2, control.height/2)
@@ -309,6 +311,8 @@ Item {
         }
 
         function test_dragThreshold() {
+            if (Settings.hasTouchScreen)
+                skip("Fails with touch screens");
             var control = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {x: 20; y: 20; width: 100; height: 50}', container, '')
 
             var pt = { x: control.width/2, y: control.height/2 }
diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index a5da7b91..610aa452 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -39,6 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
+import QtQuick.Controls.Private 1.0
 import QtTest 1.0
 
 Item {
@@ -367,6 +368,8 @@ Item {
         }
 
         function test_get_active_focus_when_up_or_down_was_pressed(){
+            if (Settings.hasTouchScreen)
+                skip("Fails with touch screens");
             var test_control = 'import QtQuick 2.2;             \
             import QtQuick.Controls 1.2;                        \
             Column {                                            \
diff --git a/tests/auto/controls/data/tst_treeview.qml b/tests/auto/controls/data/tst_treeview.qml
index 33e64e65..6cc9705f 100644
--- a/tests/auto/controls/data/tst_treeview.qml
+++ b/tests/auto/controls/data/tst_treeview.qml
@@ -41,6 +41,7 @@
 import QtQuick 2.4
 import QtTest 1.0
 import QtQuick.Controls 1.4
+import QtQuick.Controls.Private 1.0
 import QtQuickControlsTests 1.0
 
 Item {
@@ -103,6 +104,8 @@ 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);
@@ -152,6 +155,8 @@ 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);
@@ -175,6 +180,8 @@ Item {
 
         function test_expand_collapse()
         {
+            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);
@@ -239,6 +246,8 @@ Item {
 
         function test_pressAndHold()
         {
+            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);
@@ -263,6 +272,8 @@ 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);
@@ -317,6 +328,8 @@ 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);
@@ -442,6 +455,8 @@ 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);
@@ -551,6 +566,8 @@ 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);
@@ -637,6 +654,8 @@ 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);
@@ -732,6 +751,8 @@ Item {
         }
 
         function test_indexAt() {
+            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);
@@ -800,6 +821,8 @@ 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);