diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:02:35 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-12 03:02:35 +0200 |
commit | ecaf7132fe47f3965cdf3e48a1c2d859f3911cd0 (patch) | |
tree | 5d4045c65c51bd953dd6118bc6cc24f8c2c817bc /src/controls/Styles/Android/SpinBoxStyle.qml | |
parent | 1bc05eceb7823b38ddec1d8e874f371fb8b2045f (diff) | |
parent | 59264fc24e3806a7e43379a2b8c610148f89cccb (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I65f0f976bbf1a93240b109517ef09a33c62b6fb4
Diffstat (limited to 'src/controls/Styles/Android/SpinBoxStyle.qml')
-rw-r--r-- | src/controls/Styles/Android/SpinBoxStyle.qml | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/src/controls/Styles/Android/SpinBoxStyle.qml b/src/controls/Styles/Android/SpinBoxStyle.qml index 74126e9a0..82a63dd86 100644 --- a/src/controls/Styles/Android/SpinBoxStyle.qml +++ b/src/controls/Styles/Android/SpinBoxStyle.qml @@ -37,6 +37,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.4 import QtQuick.Window 2.2 import QtQuick.Controls 1.2 @@ -72,10 +73,30 @@ Style { styleDef: panel.styleDef.View_background } - Binding { target: style; property: "padding.top"; value: bg.padding.top } - Binding { target: style; property: "padding.left"; value: bg.padding.left } - Binding { target: style; property: "padding.right"; value: bg.padding.right } - Binding { target: style; property: "padding.bottom"; value: bg.padding.bottom } + Qml.Binding { + target: style + property: "padding.top" + value: bg.padding.top + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: style + property: "padding.left" + value: bg.padding.left + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: style + property: "padding.right" + value: bg.padding.right + restoreMode: Binding.RestoreBinding + } + Qml.Binding { + target: style + property: "padding.bottom" + value: bg.padding.bottom + restoreMode: Binding.RestoreBinding + } readonly property alias font: label.font readonly property alias foregroundColor: label.color |