diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-31 09:04:29 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-01-31 13:01:04 +0100 |
commit | 5d27e14e4ca49263d9c3309b5e93d4cb386063cc (patch) | |
tree | 714832e22d596c721744fd080148856a95f6d8f5 /src/quicktemplates2/qquickcontrol.cpp | |
parent | ac6f4903aeb2e8399b5aa538b35a760f0392568c (diff) | |
parent | c3858bd53974e486e03537d1937deb0020828556 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I697f98d5214f487c915032d744ec593da05368a8
Diffstat (limited to 'src/quicktemplates2/qquickcontrol.cpp')
-rw-r--r-- | src/quicktemplates2/qquickcontrol.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index 080317d8..67c89729 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -1446,6 +1446,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); |