diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-22 10:58:06 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-22 10:21:31 +0000 |
| commit | aca950e43a25f4b80707ff4e2f17d71aef441d52 (patch) | |
| tree | b3729c20ee750a8b52d40505631d90ae928af3ff | |
| parent | ffda6894cc80909f900447d4de24bcc0effd467b (diff) | |
Control: fix background size regression caused by deferred execution
Task-number: QTBUG-65880
Change-Id: Ic4f9fb087f4a78bd4c6257828011240186b6b22e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_popup.qml | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 809c9f94..8d571c34 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -1320,6 +1320,7 @@ void QQuickControl::componentComplete() d->executeBackground(true); d->executeContentItem(true); QQuickItem::componentComplete(); + d->resizeBackground(); d->resizeContent(); if (!d->hasLocale) d->locale = QQuickControlPrivate::calcLocale(d->parentItem); diff --git a/tests/auto/controls/data/tst_popup.qml b/tests/auto/controls/data/tst_popup.qml index bec50ad0..1f3a097f 100644 --- a/tests/auto/controls/data/tst_popup.qml +++ b/tests/auto/controls/data/tst_popup.qml @@ -1253,4 +1253,12 @@ TestCase { control.open() verify(control.visible) } + + function test_deferredBackgroundSize() { + var control = createTemporaryObject(popupControl, testCase, {width: 200, height: 100}) + verify(control) + + compare(control.background.width, 200) + compare(control.background.height, 100) + } } |