diff --git a/tests/components/combobox.qml b/tests/components/combobox.qml index 6e8083328..5fd0deb6b 100644 --- a/tests/components/combobox.qml +++ b/tests/components/combobox.qml @@ -1,35 +1,26 @@ import QtQuick 2.0 import org.kde.plasma.components 2.0 import org.kde.plasma.core 2.0 as PlasmaCore ComponentBase { Flow { anchors.fill: parent anchors.margins: 20 spacing: 20 ListModel { id: demoModel ListElement { text: "Banana"; color: "Yellow" } ListElement { text: "Apple"; color: "Green" } ListElement { text: "Coconut"; color: "Brown" } } ComboBox { model:demoModel } ComboBox { editable: true model: demoModel } - PlasmaCore.ColorScope { - implicitWidth: childrenRect.width - implicitHeight: childrenRect.width - - colorGroup: PlasmaCore.Theme.ComplementaryColorGroup - ComboBox { - model:demoModel - } - } } } diff --git a/tests/components/combobox.qml b/tests/components/combobox3.qml similarity index 59% copy from tests/components/combobox.qml copy to tests/components/combobox3.qml index 6e8083328..3babd12ac 100644 --- a/tests/components/combobox.qml +++ b/tests/components/combobox3.qml @@ -1,35 +1,27 @@ import QtQuick 2.0 -import org.kde.plasma.components 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.components 3.0 ComponentBase { Flow { anchors.fill: parent anchors.margins: 20 spacing: 20 ListModel { id: demoModel ListElement { text: "Banana"; color: "Yellow" } ListElement { text: "Apple"; color: "Green" } ListElement { text: "Coconut"; color: "Brown" } } ComboBox { model:demoModel + textRole: "text" } ComboBox { editable: true model: demoModel - } - PlasmaCore.ColorScope { - implicitWidth: childrenRect.width - implicitHeight: childrenRect.width - - colorGroup: PlasmaCore.Theme.ComplementaryColorGroup - ComboBox { - model:demoModel - } + textRole: "text" } } }