summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-11-17 15:06:34 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-11-17 14:41:38 +0000
commit9213929a0061020b7ff18674c931acc62f42f72f (patch)
tree0e3dbb0ff4d22b18ee87775415a47c9f24311ad8
parent357dc28318b20e18a48a694dd66d62fa3a5544f1 (diff)
downloadqtquickcontrols-9213929a0061020b7ff18674c931acc62f42f72f.tar.gz
Skip PieMenu tests when touch screen is present.
Task-number: QTBUG-49353 Change-Id: I285f058f7df9cceb9d9c52bd822cd3ad772627fc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
-rw-r--r--tests/auto/extras/data/tst_piemenu.qml11
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/auto/extras/data/tst_piemenu.qml b/tests/auto/extras/data/tst_piemenu.qml
index 12dbe223..d709f513 100644
--- a/tests/auto/extras/data/tst_piemenu.qml
+++ b/tests/auto/extras/data/tst_piemenu.qml
@@ -41,6 +41,7 @@
import QtTest 1.0
import QtQuick 2.1
import QtQuick.Controls 1.1
+import QtQuick.Controls.Private 1.0
import QtQuick.Extras 1.4
import QtQuick.Extras.Private 1.0
import QtQuick.Extras.Private.CppUtils 1.0
@@ -354,6 +355,8 @@ Item {
}
function test_selectionAngle(data) {
+ if (Settings.hasTouchScreen)
+ skip("Fails with touch screens");
var pieMenuComponent = Qt.createComponent("PieMenu3Items.qml");
tryCompare(pieMenuComponent, "status", Component.Ready);
root = pieMenuComponent.createObject(container);
@@ -505,6 +508,8 @@ Item {
}
function test_hideItem(data) {
+ if (Settings.hasTouchScreen)
+ skip("Fails with touch screens");
var pieMenuComponent = Qt.createComponent("PieMenu3Items.qml");
tryCompare(pieMenuComponent, "status", Component.Ready);
root = pieMenuComponent.createObject(container);
@@ -605,6 +610,8 @@ Item {
}
function test_selectionItemOnMouseMove_QTRD3024() {
+ if (Settings.hasTouchScreen)
+ skip("Fails with touch screens");
// Check when an item is hovered by the mouse, it gets made current
// as expected and the current item is cleared when the mouse moves outside the menu
var pieMenuComponent = Qt.createComponent("PieMenu3Items.qml");
@@ -676,6 +683,8 @@ Item {
function test_QTRD3027() {
// Check that an item's selection is cleared when the mouse moves outside
// its boundaries without changing the selectionAngle
+ if (Settings.hasTouchScreen)
+ skip("Fails with touch screens");
var pieMenuComponent = Qt.createComponent("PieMenu3Items.qml");
tryCompare(pieMenuComponent, "status", Component.Ready);
root = pieMenuComponent.createObject(container);
@@ -702,6 +711,8 @@ Item {
}
function test_rotatedBoundingItem() {
+ if (Settings.hasTouchScreen)
+ skip("Fails with touch screens");
var pieMenuComponent = Qt.createComponent("PieMenuRotatedBoundingItem.qml");
tryCompare(pieMenuComponent, "status", Component.Ready);
root = pieMenuComponent.createObject(container);