diff options
Diffstat (limited to 'src/extras/Styles')
-rw-r--r-- | src/extras/Styles/Flat/ApplicationWindowStyle.qml | 5 | ||||
-rw-r--r-- | src/extras/Styles/Flat/GroupBoxStyle.qml | 5 |
2 files changed, 7 insertions, 3 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 } } } diff --git a/src/extras/Styles/Flat/GroupBoxStyle.qml b/src/extras/Styles/Flat/GroupBoxStyle.qml index c932262b..797086a2 100644 --- a/src/extras/Styles/Flat/GroupBoxStyle.qml +++ b/src/extras/Styles/Flat/GroupBoxStyle.qml @@ -36,6 +36,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls.Private 1.0 as Private import QtQuick.Controls.Styles.Flat 1.0 @@ -67,10 +69,11 @@ Private.GroupBoxStyle { } // TODO: - Binding { + Qml.Binding { target: root.padding property: "top" value: background.anchors.topMargin + root.spacing + restoreMode: Binding.RestoreBinding } CheckBoxDrawer { |