diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-15 03:03:46 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-15 03:03:47 +0200 |
| commit | 3b953346feba686dbd64d7612b9739abfe0538b0 (patch) | |
| tree | 3a5d80b85e2e5f451544c94e0cd998a5418aa6b7 /src/controls/ApplicationWindow.qml | |
| parent | bb9c24fb6c6716d226f9f81df98ee8dda34eada8 (diff) | |
| parent | ecaf7132fe47f3965cdf3e48a1c2d859f3911cd0 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia150cd4c2e446eca3e6fbc23d9ebdf4c4e2a7516
Diffstat (limited to 'src/controls/ApplicationWindow.qml')
| -rw-r--r-- | src/controls/ApplicationWindow.qml | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index b739ecaeb..7d215556e 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick.Window 2.2 import QtQuick 2.2 import QtQuick.Controls 1.2 @@ -171,19 +172,21 @@ Window { /*! \internal */ property real __width: 0 - Binding { + Qml.Binding { target: root property: "__width" when: (root.minimumWidth <= root.maximumWidth) && !contentArea.__noImplicitWidthGiven value: Math.max(Math.min(root.maximumWidth, contentArea.implicitWidth), root.minimumWidth) + restoreMode: Binding.RestoreBinding } /*! \internal */ property real __height: 0 - Binding { + Qml.Binding { target: root property: "__height" when: (root.minimumHeight <= root.maximumHeight) && !contentArea.__noImplicitHeightGiven value: Math.max(Math.min(root.maximumHeight, contentArea.implicitHeight + __topBottomMargins), root.minimumHeight) + restoreMode: Binding.RestoreBinding } /* As soon as an application developer writes width: 200 @@ -224,16 +227,32 @@ Window { onStatusChanged: if (status === Loader.Error) console.error("Failed to load Style for", root) } - Binding { target: toolBar; property: "parent"; value: __panel.toolBarArea } - Binding { target: statusBar; property: "parent"; value: __panel.statusBarArea } + Qml.Binding { + target: toolBar + property: "parent" + value: __panel.toolBarArea + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: statusBar + property: "parent" + value: __panel.statusBarArea + restoreMode: Binding.RestoreBinding + } - Binding { + Qml.Binding { property: "parent" target: menuBar ? menuBar.__contentItem : null when: menuBar && !menuBar.__isNative value: __panel.menuBarArea + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: menuBar + property: "__parentWindow" + value: root + restoreMode: Binding.RestoreBinding } - Binding { target: menuBar; property: "__parentWindow"; value: root } Keys.forwardTo: menuBar ? [menuBar.__contentItem, __panel] : [] |