diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-24 03:00:29 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-24 03:00:29 +0100 |
| commit | 38f7cecf6f74ef73e1a86ea48a74364e130511a7 (patch) | |
| tree | fc77829cd0c50042ca812a82eb6175df0e6c9595 | |
| parent | 7d11f3c452d1d864caab54375a8ed17c0c607a26 (diff) | |
| parent | a41a3268c7b1f1d510c452e5430db0d5e5ee4055 (diff) | |
| download | qtquickcontrols-38f7cecf6f74ef73e1a86ea48a74364e130511a7.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I9edca09bd64ca1e35f649518f201b15821f763b9
| -rw-r--r-- | src/controls/Styles/Base/CheckBoxStyle.qml | 2 | ||||
| -rw-r--r-- | src/controls/Styles/Base/RadioButtonStyle.qml | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/src/controls/Styles/Base/CheckBoxStyle.qml b/src/controls/Styles/Base/CheckBoxStyle.qml index 30057ca1..98f45740 100644 --- a/src/controls/Styles/Base/CheckBoxStyle.qml +++ b/src/controls/Styles/Base/CheckBoxStyle.qml @@ -182,13 +182,11 @@ Style { Loader { id: indicatorLoader sourceComponent: indicator - anchors.verticalCenter: parent.verticalCenter } Loader { id: labelLoader Layout.fillWidth: true sourceComponent: label - anchors.verticalCenter: parent.verticalCenter } } } diff --git a/src/controls/Styles/Base/RadioButtonStyle.qml b/src/controls/Styles/Base/RadioButtonStyle.qml index 4df89fb3..768345b9 100644 --- a/src/controls/Styles/Base/RadioButtonStyle.qml +++ b/src/controls/Styles/Base/RadioButtonStyle.qml @@ -162,12 +162,10 @@ Style { Loader { id: indicatorLoader sourceComponent: indicator - anchors.verticalCenter: parent.verticalCenter } Loader { id: labelLoader sourceComponent: label - anchors.verticalCenter: parent.verticalCenter } } } |