diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-08 18:15:52 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-10 07:14:11 +0000 |
| commit | 1a960f72f2f34c958675bd047c12f0589c418263 (patch) | |
| tree | 7431385eab8206464eb13797936f626d9f70d8a8 | |
| parent | 04f4de502cd420da870b83e062a50833be63bde5 (diff) | |
Fix background size regression caused by deferred execution
Same as aca950e4 for QQuickControl.
Change-Id: I508bb882cae7dd578349351d1f48919c45ca3d27
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit e53908bda45cde0d75d35565c29995aef48bb026)
| -rw-r--r-- | src/quicktemplates2/qquicklabel.cpp | 1 | ||||
| -rw-r--r-- | src/quicktemplates2/qquicktextarea.cpp | 1 | ||||
| -rw-r--r-- | src/quicktemplates2/qquicktextfield.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp index 44baf1c3..a31f7de0 100644 --- a/src/quicktemplates2/qquicklabel.cpp +++ b/src/quicktemplates2/qquicklabel.cpp @@ -267,6 +267,7 @@ void QQuickLabel::componentComplete() Q_D(QQuickLabel); d->executeBackground(true); QQuickText::componentComplete(); + d->resizeBackground(); #if QT_CONFIG(accessibility) if (!d->accessibleAttached && QAccessible::isActive()) d->accessibilityActiveChanged(true); diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index 6b492ff2..d40ca560 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -639,6 +639,7 @@ void QQuickTextArea::componentComplete() Q_D(QQuickTextArea); d->executeBackground(true); QQuickTextEdit::componentComplete(); + d->resizeBackground(); #if QT_CONFIG(quicktemplates2_hover) if (!d->explicitHoverEnabled) setAcceptHoverEvents(QQuickControlPrivate::calcHoverEnabled(d->parentItem)); diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp index 8ca51ddb..275856f1 100644 --- a/src/quicktemplates2/qquicktextfield.cpp +++ b/src/quicktemplates2/qquicktextfield.cpp @@ -490,6 +490,7 @@ void QQuickTextField::componentComplete() Q_D(QQuickTextField); d->executeBackground(true); QQuickTextInput::componentComplete(); + d->resizeBackground(); #if QT_CONFIG(quicktemplates2_hover) if (!d->explicitHoverEnabled) setAcceptHoverEvents(QQuickControlPrivate::calcHoverEnabled(d->parentItem)); |