diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-07-03 09:59:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-07-03 09:59:04 +0200 |
| commit | 82e647f6887aafb2ec1e9419bc6fefc0f09bac00 (patch) | |
| tree | 829a1f4aa96de9b633bbc53427b5f14aa542d57d /src/imports/controls/universal | |
| parent | 746f0984ccdd0fc433c824b9ee2859dcd8f0a5e5 (diff) | |
| parent | dabf5d2ea0774564f29bb756b895fc9a9975b129 (diff) | |
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
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/Menu.qml | 4 |
1 files changed, 2 insertions, 2 deletions
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 |