diff options
34 files changed, 46 insertions, 46 deletions
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index 5a782f2d..16a95510 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -1,5 +1,5 @@ TARGET = qtquickcontrols2plugin -TARGETPATH = QtQuick/Controls.2 +TARGETPATH = QtQuick/Controls IMPORT_VERSION = 2.$$QT_MINOR_VERSION QT += qml quick diff --git a/src/imports/controls/default/CheckBox.qml b/src/imports/controls/default/CheckBox.qml index 3a7c3a06..eae6e208 100644 --- a/src/imports/controls/default/CheckBox.qml +++ b/src/imports/controls/default/CheckBox.qml @@ -68,7 +68,7 @@ T.CheckBox { y: (parent.height - height) / 2 defaultColor: "#353637" color: control.palette.text - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png" visible: control.checkState === Qt.Checked } diff --git a/src/imports/controls/default/CheckDelegate.qml b/src/imports/controls/default/CheckDelegate.qml index 4dec9b98..176e0843 100644 --- a/src/imports/controls/default/CheckDelegate.qml +++ b/src/imports/controls/default/CheckDelegate.qml @@ -87,7 +87,7 @@ T.CheckDelegate { y: (parent.height - height) / 2 defaultColor: "#353637" color: control.palette.text - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png" visible: control.checkState === Qt.Checked } diff --git a/src/imports/controls/default/ComboBox.qml b/src/imports/controls/default/ComboBox.qml index 2c36aac6..a402b7be 100644 --- a/src/imports/controls/default/ComboBox.qml +++ b/src/imports/controls/default/ComboBox.qml @@ -67,7 +67,7 @@ T.ComboBox { y: control.topPadding + (control.availableHeight - height) / 2 color: control.palette.dark defaultColor: "#353637" - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/double-arrow.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/double-arrow.png" opacity: enabled ? 1 : 0.3 } diff --git a/src/imports/controls/default/Dial.qml b/src/imports/controls/default/Dial.qml index daae1e64..8e94e2fb 100644 --- a/src/imports/controls/default/Dial.qml +++ b/src/imports/controls/default/Dial.qml @@ -63,7 +63,7 @@ T.Dial { height: 10 defaultColor: "#353637" color: control.visualFocus ? control.palette.highlight : control.palette.dark - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/dial-indicator.png" + source: "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/dial-indicator.png" antialiasing: true opacity: control.enabled ? 1 : 0.3 transform: [ diff --git a/src/imports/controls/default/MenuItem.qml b/src/imports/controls/default/MenuItem.qml index 0632decb..678bac57 100644 --- a/src/imports/controls/default/MenuItem.qml +++ b/src/imports/controls/default/MenuItem.qml @@ -77,7 +77,7 @@ T.MenuItem { y: control.topPadding + (control.availableHeight - height) / 2 visible: control.checked - source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/check.png" : "" + source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/check.png" : "" color: control.palette.windowText defaultColor: "#353637" } @@ -88,7 +88,7 @@ T.MenuItem { visible: control.subMenu mirror: control.mirrored - source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/Default/images/arrow-indicator.png" : "" + source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls/Default/images/arrow-indicator.png" : "" color: control.palette.windowText defaultColor: "#353637" } diff --git a/src/imports/controls/default/default.pro b/src/imports/controls/default/default.pro index 46e46531..ae6761a5 100644 --- a/src/imports/controls/default/default.pro +++ b/src/imports/controls/default/default.pro @@ -1,5 +1,5 @@ TARGET = qtquickcontrols2defaultstyleplugin -TARGETPATH = QtQuick/Controls.2/Default +TARGETPATH = QtQuick/Controls/Default IMPORT_NAME = QtQuick.Controls.Default IMPORT_VERSION = 2.$$QT_MINOR_VERSION diff --git a/src/imports/controls/default/impl/default-impl.pro b/src/imports/controls/default/impl/default-impl.pro index 88ec2077..35368a5e 100644 --- a/src/imports/controls/default/impl/default-impl.pro +++ b/src/imports/controls/default/impl/default-impl.pro @@ -1,5 +1,5 @@ TARGET = qtquickcontrols2defaultstyleimplplugin -TARGETPATH = QtQuick/Controls.2/Default/impl +TARGETPATH = QtQuick/Controls/Default/impl QML_IMPORT_NAME = QtQuick.Controls.Default.impl QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION diff --git a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.qrc b/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.qrc index eddadf2d..a6058dd1 100644 --- a/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.qrc +++ b/src/imports/controls/default/qtquickcontrols2defaultstyleplugin.qrc @@ -1,5 +1,5 @@ <RCC> - <qresource prefix="/qt-project.org/imports/QtQuick/Controls.2/Default"> + <qresource prefix="/qt-project.org/imports/QtQuick/Controls/Default"> <file>images/arrow-indicator.png</file> <file>images/arrow-indicator@2x.png</file> <file>images/arrow-indicator@3x.png</file> diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml index a04f93cb..ec9d773e 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-icononly.qml @@ -29,6 +29,6 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 Button { - 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" display: Button.IconOnly } diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml index 0c1f8ef1..3bd35a84 100644 --- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-button-textbesideicon.qml @@ -30,6 +30,6 @@ import QtQuick.Controls 2.12 Button { text: "Button" - 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" display: Button.TextBesideIcon } diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc index 5226646e..6ab649d0 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -58,7 +58,7 @@ \c Button.qml. This file can be found in the following path in your Qt installation: - \c {$QTDIR/qml/QtQuick/Controls.2/Default/Button.qml} + \c {$QTDIR/qml/QtQuick/Controls/Default/Button.qml} After doing that, we'll simply add the following line: @@ -397,7 +397,7 @@ \endcode We then copy \c Button.qml from the Default style in - \c {$QTDIR/qml/QtQuick/Controls.2/Default/} into a new \c myproject folder in our + \c {$QTDIR/qml/QtQuick/Controls/Default/} into a new \c myproject folder in our project directory. Add the newly copied \c Button.qml to \c qml.qrc, which is the resource file that contains our QML files. diff --git a/src/imports/controls/fusion/fusion.pro b/src/imports/controls/fusion/fusion.pro index 663636da..49585212 100644 --- a/src/imports/controls/fusion/fusion.pro +++ b/src/imports/controls/fusion/fusion.pro @@ -1,5 +1,5 @@ TARGET = qtquickcontrols2fusionstyleplugin -TARGETPATH = QtQuick/Controls.2/Fusion +TARGETPATH = QtQuick/Controls/Fusion IMPORT_NAME = QtQuick.Controls.Fusion IMPORT_VERSION = 2.$$QT_MINOR_VERSION diff --git a/src/imports/controls/fusion/impl/fusion-impl.pro b/src/imports/controls/fusion/impl/fusion-impl.pro index e3333e18..78692abd 100644 --- a/src/imports/controls/fusion/impl/fusion-impl.pro +++ b/src/imports/controls/fusion/impl/fusion-impl.pro @@ -1,5 +1,5 @@ TARGET = qtquickcontrols2fusionstyleimplplugin -TARGETPATH = QtQuick/Controls.2/Fusion/impl +TARGETPATH = QtQuick/Controls/Fusion/impl QML_IMPORT_NAME = QtQuick.Controls.Fusion.impl QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION diff --git a/src/imports/controls/imagine/imagine.pro b/src/imports/controls/imagine/imagine.pro index 0dfba717..9bb6afd4 100644 --- a/src/imports/controls/imagine/imagine.pro +++ b/src/imports/controls/imagine/imagine.pro @@ -1,5 +1,5 @@ TARGET = qtquickcontrols2imaginestyleplugin -TARGETPATH = QtQuick/Controls.2/Imagine +TARGETPATH = QtQuick/Controls/Imagine IMPORT_NAME = QtQuick.Controls.Imagine IMPORT_VERSION = 2.$$QT_MINOR_VERSION diff --git a/src/imports/controls/imagine/impl/imagine-impl.pro b/src/imports/controls/imagine/impl/imagine-impl.pro index cb0f7043..9b45fd31 100644 --- a/src/imports/controls/imagine/impl/imagine-impl.pro +++ b/src/imports/controls/imagine/impl/imagine-impl.pro @@ -1,5 +1,5 @@ TARGET = qtquickcontrols2imaginestyleimplplugin -TARGETPATH = QtQuick/Controls.2/Imagine/impl +TARGETPATH = QtQuick/Controls/Imagine/impl QML_IMPORT_NAME = QtQuick.Controls.Imagine.impl QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION diff --git a/src/imports/controls/material/impl/material-impl.pro b/src/imports/controls/material/impl/material-impl.pro index f0a97b18..bc063d84 100644 --- a/src/imports/controls/material/impl/material-impl.pro +++ b/src/imports/controls/material/impl/material-impl.pro @@ -1,5 +1,5 @@ TARGET = qtquickcontrols2materialstyleimplplugin -TARGETPATH = QtQuick/Controls.2/Material/impl +TARGETPATH = QtQuick/Controls/Material/impl QML_IMPORT_NAME = QtQuick.Controls.Material.impl QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro index 269f704d..ce96924e 100644 --- a/src/imports/controls/material/material.pro +++ b/src/imports/controls/material/material.pro @@ -1,5 +1,5 @@ TARGET = qtquickcontrols2materialstyleplugin -TARGETPATH = QtQuick/Controls.2/Material +TARGETPATH = QtQuick/Controls/Material IMPORT_NAME = QtQuick.Controls.Material IMPORT_VERSION = 2.$$QT_MINOR_VERSION diff --git a/src/imports/controls/universal/impl/universal-impl.pro b/src/imports/controls/universal/impl/universal-impl.pro index 520f3243..a27ae154 100644 --- a/src/imports/controls/universal/impl/universal-impl.pro +++ b/src/imports/controls/universal/impl/universal-impl.pro @@ -1,5 +1,5 @@ TARGET = qtquickcontrols2universalstyleimplplugin -TARGETPATH = QtQuick/Controls.2/Universal/impl +TARGETPATH = QtQuick/Controls/Universal/impl QML_IMPORT_NAME = QtQuick.Controls.Universal.impl QML_IMPORT_VERSION = 2.$$QT_MINOR_VERSION diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro index 9065936c..33dd8f14 100644 --- a/src/imports/controls/universal/universal.pro +++ b/src/imports/controls/universal/universal.pro @@ -1,5 +1,5 @@ TARGET = qtquickcontrols2universalstyleplugin -TARGETPATH = QtQuick/Controls.2/Universal +TARGETPATH = QtQuick/Controls/Universal IMPORT_NAME = QtQuick.Controls.Universal IMPORT_VERSION = 2.$$QT_MINOR_VERSION diff --git a/src/imports/controlsimpl/controlsimpl.pro b/src/imports/controlsimpl/controlsimpl.pro index 70f3e170..89d4e1bd 100644 --- a/src/imports/controlsimpl/controlsimpl.pro +++ b/src/imports/controlsimpl/controlsimpl.pro @@ -1,5 +1,5 @@ TARGET = qtquickcontrols2implplugin -TARGETPATH = QtQuick/Controls.2/impl +TARGETPATH = QtQuick/Controls/impl IMPORT_VERSION = 2.$$QT_MINOR_VERSION QT += qml quick 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 |