summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2014-10-03 10:39:38 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2014-10-03 12:43:53 +0200
commit83add3f07eabcd86d43d0ff3d49c4de272017df1 (patch)
tree2d673b32c7fdb4c1c01e08f3e482bc20841e86c8
parent0406b19521a69199d2df5d8691c2c55a23309d61 (diff)
downloadqtquickcontrols-83add3f07eabcd86d43d0ff3d49c4de272017df1.tar.gz
ToolBar: fix the right margin
A regression introduced by 7909cd1 Change-Id: Ia7f1dd4da53619e39245cdd9cf3752c13cefad94 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
-rw-r--r--src/controls/ToolBar.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml
index 8fed257a..cc07fd5c 100644
--- a/src/controls/ToolBar.qml
+++ b/src/controls/ToolBar.qml
@@ -151,7 +151,7 @@ FocusScope {
anchors.topMargin: topMargin
anchors.leftMargin: leftMargin
- anchors.rightMargin: rightMargin + buttonLoader.active ? buttonLoader.width : 0
+ anchors.rightMargin: rightMargin + (buttonLoader.active ? buttonLoader.width : 0)
anchors.bottomMargin: bottomMargin
property int topMargin: __style ? __style.padding.top : 0