From 9b67ed1dde437448b927ef839ca60a2820f021dc Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 18 Jun 2015 13:50:50 +0200 Subject: Revert "Rename Control::availableWidth/Height to contentWidth/Height" TextField and TextArea have different semantics for contentWidth and contentHeight. In addition, it looks like we need to restore contentWidth and contentHeight for Frame & GroupBox. This reverts commit 6941b934bdf5f3c7b65f682c8dfc5c6562292351. Change-Id: Ia115025a67b472ac67fbbc915b80312e4b4a7431 Reviewed-by: J-P Nurmi --- src/imports/controls/GroupBox.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imports/controls/GroupBox.qml') diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index 6993a7f0..e3068014 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -57,7 +57,7 @@ AbstractGroupBox { label: Text { x: control.leftPadding - width: control.contentWidth + width: control.availableWidth text: control.title color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor -- cgit v1.2.3