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

 Conflicts:
	src/imports/controls/Menu.qml
	src/imports/controls/fusion/Menu.qml
	src/imports/controls/imagine/Menu.qml
	src/imports/controls/material/Menu.qml
	src/imports/controls/universal/Menu.qml

Change-Id: I017949e5ac617c1cdeece71204e5aa519776fb39

6 files changed, 14 insertions, 10 deletions

diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml
index 215d569d..cebca827 100644
--- a/src/imports/controls/Menu.qml
+++ b/src/imports/controls/Menu.qml
@@ -38,6 +38,7 @@ import QtQuick 2.12
 import QtQuick.Controls 2.5
 import QtQuick.Controls.impl 2.5
 import QtQuick.Templates 2.5 as T
+import QtQuick.Window 2.12
 
 T.Menu {
     id: control
@@ -55,8 +56,7 @@ T.Menu {
     contentItem: ListView {
         implicitHeight: contentHeight
         model: control.contentModel
-        // TODO: improve this?
-        interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false
+        interactive: Window.window ? contentHeight > Window.window.height : false
         clip: true
         currentIndex: control.currentIndex
 
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf
index 2cc08d45..dfb7fc12 100644
--- a/src/imports/controls/doc/qtquickcontrols2.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf
@@ -51,6 +51,10 @@ sourcedirs += ../../../quicktemplates2 \
               ../../templates/doc/src \
               src
 
+# Exclude .qml files from the doc build to prevent conflicts with .qml files
+# in style-specific directories; all types are documented in .cpp/.qdoc files
+excludefiles = *.qml
+
 imagedirs += images \
              ..
 
diff --git a/src/imports/controls/fusion/Menu.qml b/src/imports/controls/fusion/Menu.qml
index 752bbef4..fd64ed45 100644
--- a/src/imports/controls/fusion/Menu.qml
+++ b/src/imports/controls/fusion/Menu.qml
@@ -40,6 +40,7 @@ import QtQuick.Controls 2.5
 import QtQuick.Controls.impl 2.5
 import QtQuick.Controls.Fusion 2.5
 import QtQuick.Controls.Fusion.impl 2.5
+import QtQuick.Window 2.12
 
 T.Menu {
     id: control
@@ -58,8 +59,7 @@ T.Menu {
     contentItem: ListView {
         implicitHeight: contentHeight
         model: control.contentModel
-        // TODO: improve this?
-        interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false
+        interactive: Window.window ? contentHeight > Window.window.height : false
         clip: true
         currentIndex: control.currentIndex
 
diff --git a/src/imports/controls/imagine/Menu.qml b/src/imports/controls/imagine/Menu.qml
index 40f71b53..bf7540fd 100644
--- a/src/imports/controls/imagine/Menu.qml
+++ b/src/imports/controls/imagine/Menu.qml
@@ -39,6 +39,7 @@ import QtQuick.Controls 2.5
 import QtQuick.Templates 2.5 as T
 import QtQuick.Controls.Imagine 2.5
 import QtQuick.Controls.Imagine.impl 2.5
+import QtQuick.Window 2.12
 
 T.Menu {
     id: control
@@ -68,8 +69,7 @@ T.Menu {
     contentItem: ListView {
         implicitHeight: contentHeight
         model: control.contentModel
-        // TODO: improve this?
-        interactive: T.ApplicationWindow.window ? contentHeight > T.ApplicationWindow.window.height : false
+        interactive: Window.window ? contentHeight > Window.window.height : false
         clip: true
         currentIndex: control.currentIndex
 
diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml
index 1fcf5d43..8f7c797c 100644
--- a/src/imports/controls/material/Menu.qml
+++ b/src/imports/controls/material/Menu.qml
@@ -39,6 +39,7 @@ import QtQuick.Controls 2.5
 import QtQuick.Templates 2.5 as T
 import QtQuick.Controls.Material 2.5
 import QtQuick.Controls.Material.impl 2.5
+import QtQuick.Window 2.12
 
 T.Menu {
     id: control
@@ -73,8 +74,7 @@ T.Menu {
         implicitHeight: contentHeight
 
         model: control.contentModel
-        // TODO: improve this?
-        interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false
+        interactive: Window.window ? contentHeight > Window.window.height : false
         clip: true
         currentIndex: control.currentIndex
 
diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml
index 46f85357..567b13af 100644
--- a/src/imports/controls/universal/Menu.qml
+++ b/src/imports/controls/universal/Menu.qml
@@ -38,6 +38,7 @@ import QtQuick 2.12
 import QtQuick.Controls 2.5
 import QtQuick.Templates 2.5 as T
 import QtQuick.Controls.Universal 2.5
+import QtQuick.Window 2.12
 
 T.Menu {
     id: control
@@ -55,8 +56,7 @@ T.Menu {
     contentItem: ListView {
         implicitHeight: contentHeight
         model: control.contentModel
-        // TODO: improve this?
-        interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false
+        interactive: Window.window ? contentHeight > Window.window.height : false
         clip: true
         currentIndex: control.currentIndex