aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-03-26 16:07:16 +0100
committerMitch Curtis <mitch.curtis@qt.io>2020-08-26 11:45:59 +0200
commit44847322109bd237498f3f74c4784bf27757a810 (patch)
tree865ef8462e82d034b8e641d5bd94e22c9ebf8726 /tests
parent5246dd2de211ffb81313a5c29ae7894545a28c43 (diff)
Remove ".2" from TARGETPATH, resource prefixes, etc.
Qt Quick Controls 1 will be removed in Qt 6, so now we can have the simplified path for ourselves. Having the .2 in the path causes issues for importing now that the version is being bumped to 6. Task-number: QTBUG-82922 Change-Id: I0b92cdd44c42c19b1c82e7b9a7959b86ac26c6e2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
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
13 files changed, 23 insertions, 23 deletions
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index 22962fb3..57d92e7d 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/Default/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/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 74e91dfe..971d3514 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/Default/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/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 7db20b64..f74a8a42 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/Default/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/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 8f9f6014..a3433534 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/Default/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/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 7845fdff..88259165 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/Default/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/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 57900dc4..b2a2813a 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/Default/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/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 9e7a0a67..a2600774 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/Default/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/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 3bdfc83d..890c89b8 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/Default/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/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 7893a516..2ebbd8b3 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/Default/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/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 926b4595..c533c801 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/Default/images/check.png",
+ "icon.source": "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png",
"LayoutMirroring.enabled": !!data.mirrored
})
verify(control)
- compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png")
+ compare(control.icon.source, "qrc:/qt-project.org/imports/QtQuick/Controls/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 7fe8949c..6600c365 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/Default/images/check.png"
+ icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/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 2676c564..eb366664 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/Default/images/check.png"
+ icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/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 961effdd..627a5b48 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/Default/images/check.png"
+ icon.source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png"
IconLabel {
spacing: 10