aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-09 03:01:06 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-04-09 03:01:06 +0200
commitd1fdbd128f6e95255c7d9fc20ef07f44677a649e (patch)
treeef0b6b5e7b7ac010539bfdeeb4ca3198d790181b /src/imports/controls
parent6c787542df32c59fe0299b2ad884968de28dbcba (diff)
parent9001812730bccd4ee5153ad47aa130b230c27d78 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Diffstat (limited to 'src/imports/controls')
-rw-r--r--src/imports/controls/ComboBox.qml3
-rw-r--r--src/imports/controls/ItemDelegate.qml2
-rw-r--r--src/imports/controls/doc/qtquickcontrols.qdocconf1
-rw-r--r--src/imports/controls/qquickdefaulttheme.cpp2
4 files changed, 5 insertions, 3 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index 69156114..3bca9c02 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -55,7 +55,8 @@ T.ComboBox {
delegate: ItemDelegate {
width: parent.width
text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
- palette.text: control.highlightedIndex === index ? control.palette.highlightedText : control.palette.text
+ palette.text: control.palette.text
+ palette.highlightedText: control.palette.highlightedText
font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal
highlighted: control.highlightedIndex === index
hoverEnabled: control.hoverEnabled
diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/ItemDelegate.qml
index 8cc12cab..6229e2bb 100644
--- a/src/imports/controls/ItemDelegate.qml
+++ b/src/imports/controls/ItemDelegate.qml
@@ -64,7 +64,7 @@ T.ItemDelegate {
icon: control.icon
text: control.text
font: control.font
- color: control.palette.text
+ color: control.highlighted ? control.palette.highlightedText : control.palette.text
}
background: Rectangle {
diff --git a/src/imports/controls/doc/qtquickcontrols.qdocconf b/src/imports/controls/doc/qtquickcontrols.qdocconf
index 9536b428..2a01d058 100644
--- a/src/imports/controls/doc/qtquickcontrols.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols.qdocconf
@@ -6,6 +6,7 @@ description = Qt Quick Controls Reference Documentation
version = $QT_VERSION
qhp.projects = QtQuickControls
+moduleheader = QtQuickControls2
qhp.QtQuickControls.file = qtquickcontrols.qhp
qhp.QtQuickControls.namespace = org.qt-project.qtquickcontrols.$QT_VERSION_TAG
diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp
index bc292c2f..26fb2a2f 100644
--- a/src/imports/controls/qquickdefaulttheme.cpp
+++ b/src/imports/controls/qquickdefaulttheme.cpp
@@ -60,7 +60,7 @@ void QQuickDefaultTheme::initialize(QQuickTheme *theme)
systemPalette.setColor(QPalette::Highlight, QColor::fromRgba(0xFF0066FF));
systemPalette.setColor(QPalette::Disabled, QPalette::Highlight, QColor::fromRgba(0xFFF0F6FF));
- systemPalette.setColor(QPalette::HighlightedText, QColor::fromRgba(0xFFFFFFFF));
+ systemPalette.setColor(QPalette::HighlightedText, QColor::fromRgba(0xFF090909));
systemPalette.setColor(QPalette::Light, QColor::fromRgba(0xFFF6F6F6));