diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-18 13:56:41 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-18 13:56:41 +0200 |
| commit | 7a6249c8f9fdfb829312135073ce8733d1d721a5 (patch) | |
| tree | 8d11636c27beda4f7de92630f21ae2451d2397eb /tests/auto/controls/data/tst_page.qml | |
| parent | 76067f3699217e9574c72660ea65827819c7ffea (diff) | |
| parent | c0232099a9fac03ef0f5287b6a26dbbd46669c06 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/imports/controls/Page.qml
src/imports/controls/fusion/Page.qml
src/imports/controls/imagine/Page.qml
src/imports/controls/material/Page.qml
src/imports/controls/universal/Page.qml
Change-Id: I5acf99d0d2009151d6daff9420d79cb06909c873
Diffstat (limited to 'tests/auto/controls/data/tst_page.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_page.qml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/controls/data/tst_page.qml b/tests/auto/controls/data/tst_page.qml index 5d5a7e8b..c709c216 100644 --- a/tests/auto/controls/data/tst_page.qml +++ b/tests/auto/controls/data/tst_page.qml @@ -241,10 +241,13 @@ TestCase { + control.header.implicitHeight + control.footer.implicitHeight + 2 * control.spacing) control.header.implicitWidth = 150 - compare(control.implicitWidth, control.header.implicitWidth + control.leftPadding + control.rightPadding) + compare(control.implicitWidth, control.header.implicitWidth) control.footer.implicitWidth = 160 - compare(control.implicitWidth, control.footer.implicitWidth + control.leftPadding + control.rightPadding) + compare(control.implicitWidth, control.footer.implicitWidth) + + control.contentItem.implicitWidth = 170 + compare(control.implicitWidth, control.contentItem.implicitWidth + control.leftPadding + control.rightPadding) } function test_spacing_data() { |