Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	src/imports/controls/ComboBox.qml
	src/imports/controls/material/ComboBox.qml
	src/imports/controls/universal/ComboBox.qml

Change-Id: Ib900bb6298c32245399f52980b44575b64b7409f

1 files changed, 14 insertions, 0 deletions

diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index d49c9b0e..9b220a2b 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -638,6 +638,20 @@ void QQuickApplicationWindow::resetFont()
 }
 
 
+/*!
+    \qmlproperty Locale QtQuick.Controls::ApplicationWindow::locale
+
+    This property holds the locale of the window.
+
+    The default locale depends on the system environment. You can set the
+    default locale by calling QLocale::setDefault(), before loading any QML.
+
+    ApplicationWindow propagates the locale to child controls. If you change
+    the window's locale, that locale propagates to all child controls in the
+    window, overriding the system default locale.
+
+    \sa Control::locale, {LayoutMirroring}{LayoutMirroring}
+*/
 QLocale QQuickApplicationWindow::locale() const
 {
     Q_D(const QQuickApplicationWindow);