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

Change-Id: Ie09cfdd17b00e56f3ba8677d25b24417dd4e42f6

17 files changed, 49 insertions, 19 deletions

diff --git a/src/imports/controls/HorizontalHeaderView.qml b/src/imports/controls/HorizontalHeaderView.qml
index 7f0454da..ec91af25 100644
--- a/src/imports/controls/HorizontalHeaderView.qml
+++ b/src/imports/controls/HorizontalHeaderView.qml
@@ -55,7 +55,9 @@ T.HorizontalHeaderView {
 
         Text {
             id: text
-            text: model[control.textRole]
+            text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole]
+                                        : model[control.textRole])
+                                   : modelData
             width: parent.width
             height: parent.height
             horizontalAlignment: Text.AlignHCenter
diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml
index 041942f5..cf3a52f2 100644
--- a/src/imports/controls/Menu.qml
+++ b/src/imports/controls/Menu.qml
@@ -56,7 +56,9 @@ T.Menu {
     contentItem: ListView {
         implicitHeight: contentHeight
         model: control.contentModel
-        interactive: Window.window ? contentHeight > Window.window.height : false
+        interactive: Window.window
+                        ? contentHeight + control.topPadding + control.bottomPadding > Window.window.height
+                        : false
         clip: true
         currentIndex: control.currentIndex
 
diff --git a/src/imports/controls/VerticalHeaderView.qml b/src/imports/controls/VerticalHeaderView.qml
index 5fbfaedf..3fc9ca5a 100644
--- a/src/imports/controls/VerticalHeaderView.qml
+++ b/src/imports/controls/VerticalHeaderView.qml
@@ -55,7 +55,9 @@ T.VerticalHeaderView {
 
         Text {
             id: text
-            text: model[control.textRole]
+            text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole]
+                                        : model[control.textRole])
+                                   : modelData
             width: parent.width
             height: parent.height
             horizontalAlignment: Text.AlignHCenter
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
index 395f3b36..ac306aaa 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc
@@ -46,9 +46,9 @@
     The \l{Qt Quick Controls QML Types}{QML types} can be imported into your
     application using the following import statement in your \c {.qml} file:
 
-    \code \QtMinorVersion
+    \qml \QtMinorVersion
     import QtQuick.Controls 2.\1
-    \endcode
+    \endqml
 
     The \l{Qt Quick Controls C++ Classes}{C++ classes} can be included into
     your application using the following include statement:
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
index 360d2059..7fbc8c4d 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-qmltypes.qdoc
@@ -40,9 +40,9 @@
     Qt Quick Controls QML types can be imported into your application
     using the following import statement in your .qml file:
 
-    \badcode \QtMinorVersion
+    \qml \QtMinorVersion
     import QtQuick.Controls 2.\1
-    \endcode
+    \endqml
 
     \section1 QML Types
     \generatelist {qmltypesbymodule QtQuick.Controls}
diff --git a/src/imports/controls/fusion/HorizontalHeaderView.qml b/src/imports/controls/fusion/HorizontalHeaderView.qml
index 3d0f247b..bbd9dc3f 100644
--- a/src/imports/controls/fusion/HorizontalHeaderView.qml
+++ b/src/imports/controls/fusion/HorizontalHeaderView.qml
@@ -65,7 +65,9 @@ T.HorizontalHeaderView {
 
         Text {
             id: text
-            text: model[control.textRole]
+            text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole]
+                                        : model[control.textRole])
+                                   : modelData
             width: parent.width
             height: parent.height
             horizontalAlignment: Text.AlignHCenter
diff --git a/src/imports/controls/fusion/Menu.qml b/src/imports/controls/fusion/Menu.qml
index e06b70fd..8bace6b9 100644
--- a/src/imports/controls/fusion/Menu.qml
+++ b/src/imports/controls/fusion/Menu.qml
@@ -59,7 +59,9 @@ T.Menu {
     contentItem: ListView {
         implicitHeight: contentHeight
         model: control.contentModel
-        interactive: Window.window ? contentHeight > Window.window.height : false
+        interactive: Window.window
+                        ? contentHeight + control.topPadding + control.bottomPadding > Window.window.height
+                        : false
         clip: true
         currentIndex: control.currentIndex
 
diff --git a/src/imports/controls/fusion/VerticalHeaderView.qml b/src/imports/controls/fusion/VerticalHeaderView.qml
index 5ad0db8f..b220cdf2 100644
--- a/src/imports/controls/fusion/VerticalHeaderView.qml
+++ b/src/imports/controls/fusion/VerticalHeaderView.qml
@@ -65,7 +65,9 @@ T.VerticalHeaderView {
 
         Text {
             id: text
-            text: model[control.textRole]
+            text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole]
+                                        : model[control.textRole])
+                                   : modelData
             width: parent.width
             height: parent.height
             horizontalAlignment: Text.AlignHCenter
diff --git a/src/imports/controls/imagine/HorizontalHeaderView.qml b/src/imports/controls/imagine/HorizontalHeaderView.qml
index 7f0454da..ec91af25 100644
--- a/src/imports/controls/imagine/HorizontalHeaderView.qml
+++ b/src/imports/controls/imagine/HorizontalHeaderView.qml
@@ -55,7 +55,9 @@ T.HorizontalHeaderView {
 
         Text {
             id: text
-            text: model[control.textRole]
+            text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole]
+                                        : model[control.textRole])
+                                   : modelData
             width: parent.width
             height: parent.height
             horizontalAlignment: Text.AlignHCenter
diff --git a/src/imports/controls/imagine/Menu.qml b/src/imports/controls/imagine/Menu.qml
index 20a34467..832565e6 100644
--- a/src/imports/controls/imagine/Menu.qml
+++ b/src/imports/controls/imagine/Menu.qml
@@ -69,7 +69,9 @@ T.Menu {
     contentItem: ListView {
         implicitHeight: contentHeight
         model: control.contentModel
-        interactive: Window.window ? contentHeight > Window.window.height : false
+        interactive: Window.window
+                        ? contentHeight + control.topPadding + control.bottomPadding > Window.window.height
+                        : false
         clip: true
         currentIndex: control.currentIndex
 
diff --git a/src/imports/controls/imagine/VerticalHeaderView.qml b/src/imports/controls/imagine/VerticalHeaderView.qml
index 5fbfaedf..3fc9ca5a 100644
--- a/src/imports/controls/imagine/VerticalHeaderView.qml
+++ b/src/imports/controls/imagine/VerticalHeaderView.qml
@@ -55,7 +55,9 @@ T.VerticalHeaderView {
 
         Text {
             id: text
-            text: model[control.textRole]
+            text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole]
+                                        : model[control.textRole])
+                                   : modelData
             width: parent.width
             height: parent.height
             horizontalAlignment: Text.AlignHCenter
diff --git a/src/imports/controls/material/HorizontalHeaderView.qml b/src/imports/controls/material/HorizontalHeaderView.qml
index 504579cc..fd672f34 100644
--- a/src/imports/controls/material/HorizontalHeaderView.qml
+++ b/src/imports/controls/material/HorizontalHeaderView.qml
@@ -56,7 +56,9 @@ T.HorizontalHeaderView {
 
         Text {
             id: text
-            text: model[control.textRole]
+            text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole]
+                                        : model[control.textRole])
+                                   : modelData
             width: parent.width
             height: parent.height
             horizontalAlignment: Text.AlignHCenter
diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml
index d28713a7..94bcc15e 100644
--- a/src/imports/controls/material/Menu.qml
+++ b/src/imports/controls/material/Menu.qml
@@ -74,7 +74,9 @@ T.Menu {
         implicitHeight: contentHeight
 
         model: control.contentModel
-        interactive: Window.window ? contentHeight > Window.window.height : false
+        interactive: Window.window
+                        ? contentHeight + control.topPadding + control.bottomPadding > Window.window.height
+                        : false
         clip: true
         currentIndex: control.currentIndex
 
diff --git a/src/imports/controls/material/VerticalHeaderView.qml b/src/imports/controls/material/VerticalHeaderView.qml
index 7f8ecc92..5fc5aebe 100644
--- a/src/imports/controls/material/VerticalHeaderView.qml
+++ b/src/imports/controls/material/VerticalHeaderView.qml
@@ -56,7 +56,9 @@ T.VerticalHeaderView {
 
         Text {
             id: text
-            text: model[control.textRole]
+            text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole]
+                                        : model[control.textRole])
+                                   : modelData
             width: parent.width
             height: parent.height
             horizontalAlignment: Text.AlignHCenter
diff --git a/src/imports/controls/universal/HorizontalHeaderView.qml b/src/imports/controls/universal/HorizontalHeaderView.qml
index 8cdfda35..47daa8ce 100644
--- a/src/imports/controls/universal/HorizontalHeaderView.qml
+++ b/src/imports/controls/universal/HorizontalHeaderView.qml
@@ -57,7 +57,9 @@ T.HorizontalHeaderView {
 
         Text {
             id: text
-            text: model[control.textRole]
+            text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole]
+                                        : model[control.textRole])
+                                   : modelData
             width: parent.width
             height: parent.height
             horizontalAlignment: Text.AlignHCenter
diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml
index 619cfa40..4814d006 100644
--- a/src/imports/controls/universal/Menu.qml
+++ b/src/imports/controls/universal/Menu.qml
@@ -56,7 +56,9 @@ T.Menu {
     contentItem: ListView {
         implicitHeight: contentHeight
         model: control.contentModel
-        interactive: Window.window ? contentHeight > Window.window.height : false
+        interactive: Window.window
+                        ? contentHeight + control.topPadding + control.bottomPadding > Window.window.height
+                        : false
         clip: true
         currentIndex: control.currentIndex
 
diff --git a/src/imports/controls/universal/VerticalHeaderView.qml b/src/imports/controls/universal/VerticalHeaderView.qml
index 7c7544af..04408d68 100644
--- a/src/imports/controls/universal/VerticalHeaderView.qml
+++ b/src/imports/controls/universal/VerticalHeaderView.qml
@@ -57,7 +57,9 @@ T.VerticalHeaderView {
 
         Text {
             id: text
-            text: model[control.textRole]
+            text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole]
+                                        : model[control.textRole])
+                                   : modelData
             width: parent.width
             height: parent.height
             horizontalAlignment: Text.AlignHCenter