summaryrefslogtreecommitdiffstats
path: root/src/qtdevicesettings/settingscomponents/imports/Settings
diff options
context:
space:
mode:
Diffstat (limited to 'src/qtdevicesettings/settingscomponents/imports/Settings')
-rw-r--r--src/qtdevicesettings/settingscomponents/imports/Settings/CustomCombobox.qml5
-rw-r--r--src/qtdevicesettings/settingscomponents/imports/Settings/FlatStyledDropdownDelegate.qml2
-rw-r--r--src/qtdevicesettings/settingscomponents/imports/Settings/TextLabel.qml1
3 files changed, 5 insertions, 3 deletions
diff --git a/src/qtdevicesettings/settingscomponents/imports/Settings/CustomCombobox.qml b/src/qtdevicesettings/settingscomponents/imports/Settings/CustomCombobox.qml
index 72342e1..37c7871 100644
--- a/src/qtdevicesettings/settingscomponents/imports/Settings/CustomCombobox.qml
+++ b/src/qtdevicesettings/settingscomponents/imports/Settings/CustomCombobox.qml
@@ -144,7 +144,7 @@ Item {
DelegateModel {
id: comboboxModel
- delegate: comboboxDelete
+ delegate: comboboxDelegate
}
Repeater {
@@ -156,7 +156,7 @@ Item {
}
Component {
- id: comboboxDelete
+ id: comboboxDelegate
Item {
id: comboboxViewDelegate
property bool checked
@@ -168,6 +168,7 @@ Item {
sourceComponent: delegate
anchors.fill: parent
property var modelData: model
+ property string textRole: textRole
onLoaded : exgroup.bindCheckable(item)
}
diff --git a/src/qtdevicesettings/settingscomponents/imports/Settings/FlatStyledDropdownDelegate.qml b/src/qtdevicesettings/settingscomponents/imports/Settings/FlatStyledDropdownDelegate.qml
index ca68e16..c1bd24c 100644
--- a/src/qtdevicesettings/settingscomponents/imports/Settings/FlatStyledDropdownDelegate.qml
+++ b/src/qtdevicesettings/settingscomponents/imports/Settings/FlatStyledDropdownDelegate.qml
@@ -72,7 +72,7 @@ Item {
anchors.bottom: parent.bottom
anchors.margins: Math.round(10 * Flat.FlatStyle.scaleFactor)
horizontalAlignment: Text.AlignLeft
- text: modelData.text
+ text: modelData.name
}
}
}
diff --git a/src/qtdevicesettings/settingscomponents/imports/Settings/TextLabel.qml b/src/qtdevicesettings/settingscomponents/imports/Settings/TextLabel.qml
index 176f848..e9f5d12 100644
--- a/src/qtdevicesettings/settingscomponents/imports/Settings/TextLabel.qml
+++ b/src/qtdevicesettings/settingscomponents/imports/Settings/TextLabel.qml
@@ -36,6 +36,7 @@
import QtQuick 2.5
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.4
+import QtQuick.Controls.Styles.Flat 1.0 as Flat
Text {
color: systemPalette.text