Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2

Change-Id: I5b112e0e4021191c387da86bb5b0477fe0c4da30

5 files changed, 6 insertions, 4 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));
 
diff --git a/src/quicktemplates2/qquickscrollbar.cpp b/src/quicktemplates2/qquickscrollbar.cpp
index 9e6fe684..52daa27f 100644
--- a/src/quicktemplates2/qquickscrollbar.cpp
+++ b/src/quicktemplates2/qquickscrollbar.cpp
@@ -129,7 +129,7 @@ QT_BEGIN_NAMESPACE
 
     It is possible to create an instance of ScrollBar without using the
     attached property API. This is useful when the behavior of the attached
-    scoll bar is not sufficient or a \l Flickable is not in use. In the
+    scroll bar is not sufficient or a \l Flickable is not in use. In the
     following example, horizontal and vertical scroll bars are used to
     scroll over the text without using \l Flickable: