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-09 12:22:30 +0000 |
| commit | e53908bda45cde0d75d35565c29995aef48bb026 (patch) | |
| tree | b3de1496be6237cc70af7c966964828be36fa2e4 /src | |
| parent | 159599e97750ad1a9208a66303552aa8b4f2cdc7 (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>
Diffstat (limited to 'src')
| -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 8c94ee87..d39006cd 100644 --- a/src/quicktemplates2/qquicklabel.cpp +++ b/src/quicktemplates2/qquicklabel.cpp @@ -347,6 +347,7 @@ void QQuickLabel::componentComplete() Q_D(QQuickLabel); d->executeBackground(true); QQuickText::componentComplete(); + d->resizeBackground(); #if QT_CONFIG(accessibility) if (QAccessible::isActive()) d->accessibilityActiveChanged(true); diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index 9a076e83..aca13d5e 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -718,6 +718,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 49f9b4c8..876ceca6 100644 --- a/src/quicktemplates2/qquicktextfield.cpp +++ b/src/quicktemplates2/qquicktextfield.cpp @@ -569,6 +569,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)); |