diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-16 09:37:42 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-16 09:38:19 +0100 |
| commit | 08e6333450bc28c61fa804101df3ae8bef4e9568 (patch) | |
| tree | acb8973cbbd2319ab75e460e35a3278459d717df /src/imports/controls/material/ToolButton.qml | |
| parent | ef5e426bed3b1362394c7cc0c97522bb20cacff0 (diff) | |
| parent | 744d14b468eb4bdd4dabf72ef7acdca1bc07ea5d (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ibd1490e8d958361e55ac272dff75c9361239958b
Diffstat (limited to 'src/imports/controls/material/ToolButton.qml')
| -rw-r--r-- | src/imports/controls/material/ToolButton.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml index 369c7f3b..86a9f5c0 100644 --- a/src/imports/controls/material/ToolButton.qml +++ b/src/imports/controls/material/ToolButton.qml @@ -73,7 +73,7 @@ T.ToolButton { implicitWidth: 48 implicitHeight: 48 - readonly property bool square: control.contentItem.implicitWidth <= control.contentItem.implicitHeight + readonly property bool square: control.contentItem.width <= control.contentItem.height x: (parent.width - width) / 2 y: (parent.height - height) / 2 |