diff options
Diffstat (limited to 'tests/auto/controls/data/tst_tabbar.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_tabbar.qml | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/tests/auto/controls/data/tst_tabbar.qml b/tests/auto/controls/data/tst_tabbar.qml index adb27f78..58917d84 100644 --- a/tests/auto/controls/data/tst_tabbar.qml +++ b/tests/auto/controls/data/tst_tabbar.qml @@ -514,8 +514,10 @@ TestCase { control.addItem(tab1) tryCompare(tab1, "width", control.width) compare(tab1.height, control.height) - compare(control.contentWidth, tab1.implicitWidth) - compare(control.contentHeight, tab1.implicitHeight) + compare(control.implicitContentWidth, tab1.implicitWidth) + compare(control.implicitContentHeight, tab1.implicitHeight) + compare(control.contentWidth, control.implicitContentWidth) + compare(control.contentHeight, control.implicitContentHeight) compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding) compare(control.implicitHeight, control.contentHeight + control.topPadding + control.bottomPadding) @@ -525,8 +527,10 @@ TestCase { compare(tab1.height, control.height) compare(tab2.width, (control.width - data.spacing) / 2) compare(tab2.height, control.height) - compare(control.contentWidth, tab1.implicitWidth + tab2.implicitWidth + data.spacing) - compare(control.contentHeight, tab2.implicitHeight) + compare(control.implicitContentWidth, tab1.implicitWidth + tab2.implicitWidth + data.spacing) + compare(control.implicitContentHeight, tab2.implicitHeight) + compare(control.contentWidth, control.implicitContentWidth) + compare(control.contentHeight, control.implicitContentHeight) compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding) compare(control.implicitHeight, control.contentHeight + control.topPadding + control.bottomPadding) @@ -542,8 +546,10 @@ TestCase { compare(tab3.y, (control.height - tab3.height) / 2) compare(tab3.width, 50) compare(tab3.height, tab1.implicitHeight - 10) - compare(control.contentWidth, tab1.implicitWidth + tab2.implicitWidth + tab3.width + 2 * data.spacing) - compare(control.contentHeight, tab2.implicitHeight) + compare(control.implicitContentWidth, tab1.implicitWidth + tab2.implicitWidth + tab3.width + 2 * data.spacing) + compare(control.implicitContentHeight, tab2.implicitHeight) + compare(control.contentWidth, control.implicitContentWidth) + compare(control.contentHeight, control.implicitContentHeight) compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding) compare(control.implicitHeight, control.contentHeight + control.topPadding + control.bottomPadding) @@ -556,8 +562,10 @@ TestCase { compare(tab2.height, control.height) compare(tab3.width, expectedWidth) compare(tab3.height, tab3.implicitHeight) - compare(control.contentWidth, tab1.implicitWidth + tab2.implicitWidth + tab3.implicitWidth + 2 * data.spacing) - compare(control.contentHeight, tab2.implicitHeight) + compare(control.implicitContentWidth, tab1.implicitWidth + tab2.implicitWidth + tab3.implicitWidth + 2 * data.spacing) + compare(control.implicitContentHeight, tab2.implicitHeight) + compare(control.contentWidth, control.implicitContentWidth) + compare(control.contentHeight, control.implicitContentHeight) compare(control.implicitWidth, control.contentWidth + control.leftPadding + control.rightPadding) compare(control.implicitHeight, control.contentHeight + control.topPadding + control.bottomPadding) |