diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-18 13:50:50 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-18 12:37:24 +0000 |
| commit | 9b67ed1dde437448b927ef839ca60a2820f021dc (patch) | |
| tree | a3449d0916da7107a7e93bc053cf54ab24f68b4b /tests/auto/controls/data/tst_control.qml | |
| parent | fc8d59cf737b1ea1afb4348fdfd3f3dba676966d (diff) | |
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 <jpnurmi@theqtcompany.com>
Diffstat (limited to 'tests/auto/controls/data/tst_control.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_control.qml | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml index c15fa56d..555328a1 100644 --- a/tests/auto/controls/data/tst_control.qml +++ b/tests/auto/controls/data/tst_control.qml @@ -81,8 +81,8 @@ TestCase { compare(control.leftPadding, 0) compare(control.rightPadding, 0) compare(control.bottomPadding, 0) - compare(control.contentWidth, 0) - compare(control.contentHeight, 0) + compare(control.availableWidth, 0) + compare(control.availableHeight, 0) control.destroy() } @@ -142,32 +142,32 @@ TestCase { control.width = 100 control.height = 100 - compare(control.contentWidth, 100) - compare(control.contentHeight, 100) + compare(control.availableWidth, 100) + compare(control.availableHeight, 100) control.padding = 10 - compare(control.contentWidth, 80) - compare(control.contentHeight, 80) + compare(control.availableWidth, 80) + compare(control.availableHeight, 80) control.topPadding = 20 - compare(control.contentWidth, 80) - compare(control.contentHeight, 70) + compare(control.availableWidth, 80) + compare(control.availableHeight, 70) control.leftPadding = 30 - compare(control.contentWidth, 60) - compare(control.contentHeight, 70) + compare(control.availableWidth, 60) + compare(control.availableHeight, 70) control.rightPadding = 40 - compare(control.contentWidth, 30) - compare(control.contentHeight, 70) + compare(control.availableWidth, 30) + compare(control.availableHeight, 70) control.bottomPadding = 50 - compare(control.contentWidth, 30) - compare(control.contentHeight, 30) + compare(control.availableWidth, 30) + compare(control.availableHeight, 30) control.padding = 60 - compare(control.contentWidth, 30) - compare(control.contentHeight, 30) + compare(control.availableWidth, 30) + compare(control.availableHeight, 30) control.destroy() } |