diff options
| -rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_pane.qml | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 6a9d4eb3..a8f4b952 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -1180,6 +1180,7 @@ void QQuickControl::componentComplete() { Q_D(QQuickControl); QQuickItem::componentComplete(); + d->resizeContent(); if (!d->hasLocale) d->locale = QQuickControlPrivate::calcLocale(d->parentItem); if (!d->explicitHoverEnabled) diff --git a/tests/auto/controls/data/tst_pane.qml b/tests/auto/controls/data/tst_pane.qml index ec188afb..a8d901e7 100644 --- a/tests/auto/controls/data/tst_pane.qml +++ b/tests/auto/controls/data/tst_pane.qml @@ -149,6 +149,18 @@ TestCase { control.destroy() } + function test_implicitContentItem() { + var control = pane.createObject(testCase, {width: 100, height: 100}) + verify(control) + + compare(control.width, 100) + compare(control.height, 100) + compare(control.contentItem.width, control.availableWidth) + compare(control.contentItem.height, control.availableHeight) + + control.destroy() + } + function test_press() { var control = pressPane.createObject(testCase) verify(control) |