aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-07-13 16:07:07 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-07-15 09:01:32 +0000
commit0f7935fb198f371824a637abe95fb7418fe6220c (patch)
tree89c8863aa6947a75a93474c2b7c7ba8c5ff02973
parentdab15388527d68e8a72494cb3e28c17aab86d4e7 (diff)
Remove another binding to parent
Similar to what was done in 456d26e97ec7745fdbd1afaaaa6c1dc217eca060. The warning was: Material/ComboBox.qml:68: TypeError: Cannot read property 'Material' of null Task-number: QTBUG-82989 Change-Id: Id82d62d6aca0c0e517d6f8630c51f54739aea95f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit f6f42ddc724b9d01cac20632b3fda43a788d53ec) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/imports/controls/material/ComboBox.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml
index e4ee332b..151c0194 100644
--- a/src/imports/controls/material/ComboBox.qml
+++ b/src/imports/controls/material/ComboBox.qml
@@ -65,7 +65,7 @@ T.ComboBox {
delegate: MenuItem {
width: parent.width
text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
- Material.foreground: control.currentIndex === index ? parent.Material.accent : parent.Material.foreground
+ Material.foreground: control.currentIndex === index ? ListView.view.contentItem.Material.accent : ListView.view.contentItem.Material.foreground
highlighted: control.highlightedIndex === index
hoverEnabled: control.hoverEnabled
}