summaryrefslogtreecommitdiff
path: root/tests/auto/controls
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@digia.com>2013-05-07 14:21:12 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-15 10:01:38 +0200
commit795b9fdc52993e0199f462add398b5de8e4d75c4 (patch)
tree91e4e7b3748d384ce4e8fa96c8104b106c7556c1 /tests/auto/controls
parent72232a9ba0fa0ac328d60f1a1c8965cb303f4a48 (diff)
downloadqtquickcontrols-795b9fdc52993e0199f462add398b5de8e4d75c4.tar.gz
Mac: respect the system settings in Full Keyboard Access
Because we use TableView as ListView, then only SpinBox, TextField, TextAre and TableView could be selected. Change-Id: I65ca106e60a57d86e029647653ae110fd81edaa4 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'tests/auto/controls')
-rw-r--r--tests/auto/controls/data/tst_button.qml4
-rw-r--r--tests/auto/controls/data/tst_checkbox.qml5
-rw-r--r--tests/auto/controls/data/tst_combobox.qml4
-rw-r--r--tests/auto/controls/data/tst_groupbox.qml4
-rw-r--r--tests/auto/controls/data/tst_label.qml4
-rw-r--r--tests/auto/controls/data/tst_progressbar.qml4
-rw-r--r--tests/auto/controls/data/tst_radiobutton.qml5
-rw-r--r--tests/auto/controls/data/tst_scrollview.qml4
-rw-r--r--tests/auto/controls/data/tst_slider.qml4
-rw-r--r--tests/auto/controls/data/tst_statusbar.qml4
-rw-r--r--tests/auto/controls/data/tst_tabview.qml48
-rw-r--r--tests/auto/controls/data/tst_toolbar.qml4
-rw-r--r--tests/auto/controls/data/tst_toolbutton.qml4
13 files changed, 74 insertions, 24 deletions
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index f949ec6e..29e2a3f6 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -40,6 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
+import QtQuickControlsTests 1.0
Item {
id: container
@@ -122,6 +123,9 @@ TestCase {
}
function test_activeFocusOnTab() {
+ if (!SystemInfo.tabAllWidgets)
+ skip("This function doesn't support NOT iterating all.")
+
var test_control = 'import QtQuick 2.1; \
import QtQuick.Controls 1.0; \
Item { \
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index 1c74e34d..40600d9e 100644
--- a/tests/auto/controls/data/tst_checkbox.qml
+++ b/tests/auto/controls/data/tst_checkbox.qml
@@ -40,6 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
+import QtQuickControlsTests 1.0
Item {
id: container
@@ -237,6 +238,10 @@ Item {
function test_activeFocusOnTab() {
checkBox.destroy()
wait(0) //QTBUG-30523 so processEvents is called
+
+ if (!SystemInfo.tabAllWidgets)
+ skip("This function doesn't support NOT iterating all.")
+
var test_control = 'import QtQuick 2.1; \
import QtQuick.Controls 1.0; \
Item { \
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index 9110eb1c..c36218a3 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -40,6 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
+import QtQuickControlsTests 1.0
Item {
id: container
@@ -144,6 +145,9 @@ TestCase {
}
function test_activeFocusOnTab() {
+ if (!SystemInfo.tabAllWidgets)
+ skip("This function doesn't support NOT iterating all.")
+
var test_control = 'import QtQuick 2.1; \
import QtQuick.Controls 1.0; \
Item { \
diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml
index 12784b48..5599ca5f 100644
--- a/tests/auto/controls/data/tst_groupbox.qml
+++ b/tests/auto/controls/data/tst_groupbox.qml
@@ -41,6 +41,7 @@
import QtQuick 2.1
import QtTest 1.0
import QtQuick.Controls 1.0
+import QtQuickControlsTests 1.0
Item {
id: container
@@ -113,6 +114,9 @@ TestCase {
}
function test_activeFocusOnTab() {
+ if (!SystemInfo.tabAllWidgets)
+ skip("This function doesn't support NOT iterating all.")
+
var test_control = 'import QtQuick 2.1; \
import QtQuick.Controls 1.0; \
Item { \
diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml
index a5078691..9b416d6a 100644
--- a/tests/auto/controls/data/tst_label.qml
+++ b/tests/auto/controls/data/tst_label.qml
@@ -40,6 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
+import QtQuickControlsTests 1.0
Item {
id: container
@@ -59,6 +60,9 @@ TestCase {
}
function test_activeFocusOnTab() {
+ if (!SystemInfo.tabAllWidgets)
+ skip("This function doesn't support NOT iterating all.")
+
var test_control = 'import QtQuick 2.1; \
import QtQuick.Controls 1.0; \
Item { \
diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml
index 3dc7a29a..7febd661 100644
--- a/tests/auto/controls/data/tst_progressbar.qml
+++ b/tests/auto/controls/data/tst_progressbar.qml
@@ -40,6 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
+import QtQuickControlsTests 1.0
Item {
id: container
@@ -130,6 +131,9 @@ TestCase {
}
function test_activeFocusOnTab() {
+ if (!SystemInfo.tabAllWidgets)
+ skip("This function doesn't support NOT iterating all.")
+
var test_control = 'import QtQuick 2.1; \
import QtQuick.Controls 1.0; \
Item { \
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index 855f8c7a..7d04c0c3 100644
--- a/tests/auto/controls/data/tst_radiobutton.qml
+++ b/tests/auto/controls/data/tst_radiobutton.qml
@@ -40,6 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
+import QtQuickControlsTests 1.0
Item {
id: container
@@ -190,6 +191,10 @@ Item {
function test_activeFocusOnTab() {
radioButton.destroy()
wait(0) //QTBUG-30523 so processEvents is called
+
+ if (!SystemInfo.tabAllWidgets)
+ skip("This function doesn't support NOT iterating all.")
+
var test_control = 'import QtQuick 2.1; \
import QtQuick.Controls 1.0; \
Item { \
diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml
index c273c16b..d5c3e008 100644
--- a/tests/auto/controls/data/tst_scrollview.qml
+++ b/tests/auto/controls/data/tst_scrollview.qml
@@ -41,6 +41,7 @@
import QtQuick 2.1
import QtTest 1.0
import QtQuick.Controls 1.0
+import QtQuickControlsTests 1.0
Item {
id: container
@@ -114,6 +115,9 @@ TestCase {
}
function test_activeFocusOnTab() {
+ if (!SystemInfo.tabAllWidgets)
+ skip("This function doesn't support NOT iterating all.")
+
var test_control = 'import QtQuick 2.1; \
import QtQuick.Controls 1.0; \
Item { \
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index cf9e8db1..7c07ba4c 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -40,6 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
+import QtQuickControlsTests 1.0
Item {
id: container
@@ -165,6 +166,9 @@ Item {
}
function test_activeFocusOnTab() {
+ if (!SystemInfo.tabAllWidgets)
+ skip("This function doesn't support NOT iterating all.")
+
var test_control = 'import QtQuick 2.1; \
import QtQuick.Controls 1.0; \
Item { \
diff --git a/tests/auto/controls/data/tst_statusbar.qml b/tests/auto/controls/data/tst_statusbar.qml
index aa8a7d54..e95e14bb 100644
--- a/tests/auto/controls/data/tst_statusbar.qml
+++ b/tests/auto/controls/data/tst_statusbar.qml
@@ -40,6 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
+import QtQuickControlsTests 1.0
Item {
id: container
@@ -59,6 +60,9 @@ TestCase {
}
function test_activeFocusOnTab() {
+ if (!SystemInfo.tabAllWidgets)
+ skip("This function doesn't support NOT iterating all.")
+
var test_control = 'import QtQuick 2.1; \
import QtQuick.Controls 1.0; \
Item { \
diff --git a/tests/auto/controls/data/tst_tabview.qml b/tests/auto/controls/data/tst_tabview.qml
index ad132265..43c42c99 100644
--- a/tests/auto/controls/data/tst_tabview.qml
+++ b/tests/auto/controls/data/tst_tabview.qml
@@ -236,16 +236,16 @@ TestCase {
active: true; \
Column { \
objectName: "column1"; \
- property alias button1: _button1; \
- property alias button2: _button2; \
+ property alias child1: _child1; \
+ property alias child2: _child2; \
anchors.fill: parent; \
- Button { \
- id: _button1; \
- text: "button 1 in Tab1"; \
+ TextField { \
+ id: _child1; \
+ text: "textfile 1 in Tab1"; \
} \
- Button { \
- id: _button2; \
- text: "button 2 in Tab1"; \
+ TextField { \
+ id: _child2; \
+ text: "textfile 2 in Tab1"; \
} \
} \
} \
@@ -255,16 +255,16 @@ TestCase {
active: true; \
Column { \
objectName: "column2"; \
- property alias button3: _button3; \
- property alias button4: _button4; \
+ property alias child3: _child3; \
+ property alias child4: _child4; \
anchors.fill: parent; \
- Button { \
- id: _button3; \
- text: "button 1 in Tab2"; \
+ TextField { \
+ id: _child3; \
+ text: "textfile 1 in Tab2"; \
} \
- Button { \
- id: _button4; \
- text: "button 2 in Tab2"; \
+ TextField { \
+ id: _child4; \
+ text: "textfile 2 in Tab2"; \
} \
} \
} \
@@ -280,10 +280,10 @@ TestCase {
var column2 = getColumnItem(tabView.tab2, "column2")
verify(column2 !== null)
- var button1 = column1.button1
- verify(button1 !== null)
- var button3 = column2.button3
- verify(button3 !== null)
+ var child1 = column1.child1
+ verify(child1 !== null)
+ var child3 = column2.child3
+ verify(child3 !== null)
var tabbarItem = getTabBarItem(tabView)
verify(tabbarItem !== null)
@@ -300,7 +300,7 @@ TestCase {
waitForRendering(tab1)
mouseClick(tab1, tab1.width/2, tab1.height/2)
- verify(button1.activeFocus)
+ verify(child1.activeFocus)
var tab2 = mouseareas[1].parent
verify(tab2 !== null)
@@ -308,15 +308,15 @@ TestCase {
waitForRendering(tab2)
mouseClick(tab2, tab2.width/2, tab2.height/2)
- verify(button3.activeFocus)
+ verify(child3.activeFocus)
waitForRendering(tab1)
mouseClick(tab1, tab1.width/2, tab1.height/2)
- verify(button1.activeFocus)
+ verify(child1.activeFocus)
waitForRendering(tab2)
mouseClick(tab2, tab2.width/2, tab2.height/2)
- verify(button3.activeFocus)
+ verify(child3.activeFocus)
tabView.destroy()
}
diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml
index fc545bd5..97106ff4 100644
--- a/tests/auto/controls/data/tst_toolbar.qml
+++ b/tests/auto/controls/data/tst_toolbar.qml
@@ -40,6 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
+import QtQuickControlsTests 1.0
Item {
id: container
@@ -59,6 +60,9 @@ TestCase {
}
function test_activeFocusOnTab() {
+ if (!SystemInfo.tabAllWidgets)
+ skip("This function doesn't support NOT iterating all.")
+
var test_control = 'import QtQuick 2.1; \
import QtQuick.Controls 1.0; \
Item { \
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index 9ce7b143..b0258743 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -40,6 +40,7 @@
import QtQuick 2.1
import QtTest 1.0
+import QtQuickControlsTests 1.0
Item {
id: container
@@ -72,6 +73,9 @@ TestCase {
}
function test_activeFocusOnTab() {
+ if (!SystemInfo.tabAllWidgets)
+ skip("This function doesn't support NOT iterating all.")
+
var test_control = 'import QtQuick 2.1; \
import QtQuick.Controls 1.0; \
Item { \