summaryrefslogtreecommitdiff
path: root/src/extras/Styles/Flat/ApplicationWindowStyle.qml
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2019-10-02 14:45:05 +0200
committerUlf Hermann <ulf.hermann@qt.io>2019-10-04 11:15:31 +0200
commit59264fc24e3806a7e43379a2b8c610148f89cccb (patch)
treefb8ea77d461c5c68a98b59b9bd4e152606795028 /src/extras/Styles/Flat/ApplicationWindowStyle.qml
parent6eac099fa98b6dbe5a01ad90e4a1348729b1332b (diff)
downloadqtquickcontrols-59264fc24e3806a7e43379a2b8c610148f89cccb.tar.gz
Make restoreMode on all Binding elements explicit
The default is going to change in 5.15. Change-Id: Ib17500791476bd45ed2c7c3736186897fb63d7a0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/extras/Styles/Flat/ApplicationWindowStyle.qml')
-rw-r--r--src/extras/Styles/Flat/ApplicationWindowStyle.qml5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/extras/Styles/Flat/ApplicationWindowStyle.qml b/src/extras/Styles/Flat/ApplicationWindowStyle.qml
index f4fbd24a..222c9f7c 100644
--- a/src/extras/Styles/Flat/ApplicationWindowStyle.qml
+++ b/src/extras/Styles/Flat/ApplicationWindowStyle.qml
@@ -36,7 +36,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.14
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4 as Base
import QtQuick.Controls.Styles.Flat 1.0
@@ -103,12 +103,13 @@ Base.ApplicationWindowStyle {
items: control.menuBar ? control.menuBar.menus : []
}
- Binding {
+ Qml.Binding {
target: control.toolBar
property: "__menu"
value: proxyMenu.items.length > 1 ? proxyMenu :
proxyMenu.items.length === 1 ? proxyMenu.items[0] : null
when: hasToolBar
+ restoreMode: Binding.RestoreBinding
}
}
}