diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-17 23:08:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-18 22:11:24 +0200 |
| commit | d9aae9ff99d20b58487b0a48801864d13115363b (patch) | |
| tree | e98089900164f7a1008e6fb59d1815dc9eab8d2c /src/controls/Styles/Base/CheckBoxStyle.qml | |
| parent | 49bd4b76d08ec11d08105ca71e8dda4f8d459b5c (diff) | |
| parent | c2356328f88b044c8956fe7860c4c04fca4f2c30 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/controls/Private/qquickrangemodel.cpp
src/controls/Private/qquickrangemodel_p.h
src/controls/Private/qquickrangemodel_p_p.h
src/layouts/qquicklayout.cpp
tests/auto/controls/data/tst_rangemodel.qml
Change-Id: I9c8f6326c6edf9ebb18dd538f76830e1b439ba8e
Diffstat (limited to 'src/controls/Styles/Base/CheckBoxStyle.qml')
| -rw-r--r-- | src/controls/Styles/Base/CheckBoxStyle.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/Styles/Base/CheckBoxStyle.qml b/src/controls/Styles/Base/CheckBoxStyle.qml index 0baf244bd..30057ca1f 100644 --- a/src/controls/Styles/Base/CheckBoxStyle.qml +++ b/src/controls/Styles/Base/CheckBoxStyle.qml @@ -114,7 +114,7 @@ Style { /*! This defines the indicator button. */ property Component indicator: Item { implicitWidth: Math.round(TextSingleton.implicitHeight) - height: width + implicitHeight: implicitWidth Rectangle { anchors.fill: parent anchors.bottomMargin: -1 |