aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/controls/data/tst_button.qml4
-rw-r--r--tests/auto/controls/data/tst_checkdelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_itemdelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_menuitem.qml4
-rw-r--r--tests/auto/controls/data/tst_radiodelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_roundbutton.qml4
-rw-r--r--tests/auto/controls/data/tst_swipedelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_switchdelegate.qml4
-rw-r--r--tests/auto/controls/data/tst_tabbutton.qml4
-rw-r--r--tests/auto/controls/data/tst_toolbutton.qml4
-rw-r--r--tests/auto/qquickiconlabel/data/colorChanges.qml2
-rw-r--r--tests/auto/qquickiconlabel/data/iconlabel.qml2
-rw-r--r--tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml2
-rw-r--r--tests/auto/sanity/tst_sanity.cpp4
14 files changed, 25 insertions, 25 deletions
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index 83a6ea61..22962fb3 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -467,11 +467,11 @@ TestCase {
var control = createTemporaryObject(button, testCase, {
text: "Button",
display: data.display,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_checkdelegate.qml b/tests/auto/controls/data/tst_checkdelegate.qml
index 0c0565f1..74e91dfe 100644
--- a/tests/auto/controls/data/tst_checkdelegate.qml
+++ b/tests/auto/controls/data/tst_checkdelegate.qml
@@ -126,11 +126,11 @@ TestCase {
text: "CheckDelegate",
display: data.display,
width: 400,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_itemdelegate.qml b/tests/auto/controls/data/tst_itemdelegate.qml
index 1c236361..7db20b64 100644
--- a/tests/auto/controls/data/tst_itemdelegate.qml
+++ b/tests/auto/controls/data/tst_itemdelegate.qml
@@ -118,11 +118,11 @@ TestCase {
text: "ItemDelegate",
display: data.display,
width: 400,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_menuitem.qml b/tests/auto/controls/data/tst_menuitem.qml
index ef074d1d..8f9f6014 100644
--- a/tests/auto/controls/data/tst_menuitem.qml
+++ b/tests/auto/controls/data/tst_menuitem.qml
@@ -119,11 +119,11 @@ TestCase {
var control = createTemporaryObject(menuItem, testCase, {
text: "MenuItem",
display: data.display,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
var padding = data.mirrored ? control.contentItem.rightPadding : control.contentItem.leftPadding
var iconImage = findChild(control.contentItem, "image")
diff --git a/tests/auto/controls/data/tst_radiodelegate.qml b/tests/auto/controls/data/tst_radiodelegate.qml
index ff11fffb..7845fdff 100644
--- a/tests/auto/controls/data/tst_radiodelegate.qml
+++ b/tests/auto/controls/data/tst_radiodelegate.qml
@@ -126,11 +126,11 @@ TestCase {
text: "RadioDelegate",
display: data.display,
width: 400,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_roundbutton.qml b/tests/auto/controls/data/tst_roundbutton.qml
index 5f4cc5fa..57900dc4 100644
--- a/tests/auto/controls/data/tst_roundbutton.qml
+++ b/tests/auto/controls/data/tst_roundbutton.qml
@@ -122,11 +122,11 @@ TestCase {
var control = createTemporaryObject(roundButton, testCase, {
text: "RoundButton",
display: data.display,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_swipedelegate.qml b/tests/auto/controls/data/tst_swipedelegate.qml
index d37ea42b..9e7a0a67 100644
--- a/tests/auto/controls/data/tst_swipedelegate.qml
+++ b/tests/auto/controls/data/tst_swipedelegate.qml
@@ -1672,11 +1672,11 @@ TestCase {
text: "SwipeDelegate",
display: data.display,
width: 400,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_switchdelegate.qml b/tests/auto/controls/data/tst_switchdelegate.qml
index 1c96023f..3bdfc83d 100644
--- a/tests/auto/controls/data/tst_switchdelegate.qml
+++ b/tests/auto/controls/data/tst_switchdelegate.qml
@@ -560,11 +560,11 @@ TestCase {
text: "SwitchDelegate",
display: data.display,
width: 400,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_tabbutton.qml b/tests/auto/controls/data/tst_tabbutton.qml
index 96384769..7893a516 100644
--- a/tests/auto/controls/data/tst_tabbutton.qml
+++ b/tests/auto/controls/data/tst_tabbutton.qml
@@ -134,11 +134,11 @@ TestCase {
var control = createTemporaryObject(tabButton, testCase, {
text: "TabButton",
display: data.display,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index 622554c7..926b4595 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -199,11 +199,11 @@ TestCase {
var control = createTemporaryObject(toolButton, testCase, {
text: "ToolButton",
display: data.display,
- "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
var iconImage = findChild(control.contentItem, "image")
var textLabel = findChild(control.contentItem, "label")
diff --git a/tests/auto/qquickiconlabel/data/colorChanges.qml b/tests/auto/qquickiconlabel/data/colorChanges.qml
index 954c1ef4..7fe8949c 100644
--- a/tests/auto/qquickiconlabel/data/colorChanges.qml
+++ b/tests/auto/qquickiconlabel/data/colorChanges.qml
@@ -56,7 +56,7 @@ AbstractButton {
id: button
width: 200
height: 200
- icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
+ icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png"
icon.color: enabled ? "transparent" : "red"
IconLabel {
diff --git a/tests/auto/qquickiconlabel/data/iconlabel.qml b/tests/auto/qquickiconlabel/data/iconlabel.qml
index b82f9faf..2676c564 100644
--- a/tests/auto/qquickiconlabel/data/iconlabel.qml
+++ b/tests/auto/qquickiconlabel/data/iconlabel.qml
@@ -57,7 +57,7 @@ AbstractButton {
width: 200
height: 200
text: "Some text"
- icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
+ icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png"
IconLabel {
icon: button.icon
diff --git a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
index 61c9f74c..961effdd 100644
--- a/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
+++ b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
@@ -56,7 +56,7 @@ AbstractButton {
id: button
width: 200
height: 200
- icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
+ icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png"
IconLabel {
spacing: 10
diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp
index 35c48970..78e3beff 100644
--- a/tests/auto/sanity/tst_sanity.cpp
+++ b/tests/auto/sanity/tst_sanity.cpp
@@ -365,8 +365,8 @@ void tst_Sanity::attachedObjects()
void tst_Sanity::attachedObjects_data()
{
QTest::addColumn<QUrl>("url");
- addTestRowForEachControl(&engine, "controls", "QtQuick/Controls.2");
- addTestRowForEachControl(&engine, "controls/fusion", "QtQuick/Controls.2", QStringList() << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator");
+ addTestRowForEachControl(&engine, "controls/default", "QtQuick/Controls.2/Default");
+ addTestRowForEachControl(&engine, "controls/fusion", "QtQuick/Controls.2/Fusion", QStringList() << "CheckIndicator" << "RadioIndicator" << "SliderGroove" << "SliderHandle" << "SwitchIndicator");
addTestRowForEachControl(&engine, "controls/material", "QtQuick/Controls.2/Material", QStringList() << "Ripple" << "SliderHandle" << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator" << "BoxShadow" << "ElevationEffect" << "CursorDelegate");
addTestRowForEachControl(&engine, "controls/universal", "QtQuick/Controls.2/Universal", QStringList() << "CheckIndicator" << "RadioIndicator" << "SwitchIndicator");
}