4 files changed, 21 insertions, 11 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index dc4e301a36..0a26f0119f 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -2115,6 +2115,7 @@ QQuickTextEditPrivate::ExtraData::ExtraData()
     , explicitLeftPadding(false)
     , explicitRightPadding(false)
     , explicitBottomPadding(false)
+    , explicitImplicitSize(false)
 {
 }
 
@@ -2345,7 +2346,8 @@ void QQuickTextEdit::updateSize()
 
             const bool wasInLayout = d->inLayout;
             d->inLayout = true;
-            setImplicitWidth(naturalWidth + leftPadding() + rightPadding());
+            if (!d->extra.isAllocated() || !d->extra->explicitImplicitSize)
+                setImplicitWidth(naturalWidth + leftPadding() + rightPadding());
             d->inLayout = wasInLayout;
             if (d->inLayout)    // probably the result of a binding loop, but by letting it
                 return;         // get this far we'll get a warning to that effect.
@@ -2364,11 +2366,13 @@ void QQuickTextEdit::updateSize()
     QFontMetricsF fm(d->font);
     qreal newHeight = d->document->isEmpty() ? qCeil(fm.height()) : d->document->size().height();
 
-    // ### Setting the implicitWidth triggers another updateSize(), and unless there are bindings nothing has changed.
-    if (!widthValid() && !d->requireImplicitWidth)
-        setImplicitSize(newWidth + leftPadding() + rightPadding(), newHeight + topPadding() + bottomPadding());
-    else
-        setImplicitHeight(newHeight + topPadding() + bottomPadding());
+    if (!d->extra.isAllocated() || !d->extra->explicitImplicitSize) {
+        // ### Setting the implicitWidth triggers another updateSize(), and unless there are bindings nothing has changed.
+        if (!widthValid() && !d->requireImplicitWidth)
+            setImplicitSize(newWidth + leftPadding() + rightPadding(), newHeight + topPadding() + bottomPadding());
+        else
+            setImplicitHeight(newHeight + topPadding() + bottomPadding());
+    }
 
     d->xoff = leftPadding() + qMax(qreal(0), QQuickTextUtil::alignedX(d->document->size().width(), width() - leftPadding() - rightPadding(), effectiveHAlign()));
     d->yoff = topPadding() + QQuickTextUtil::alignedY(d->document->size().height(), height() - topPadding() - bottomPadding(), d->vAlign);
diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h
index a763f9e56e..90ed7f071e 100644
--- a/src/quick/items/qquicktextedit_p_p.h
+++ b/src/quick/items/qquicktextedit_p_p.h
@@ -94,6 +94,7 @@ public:
         bool explicitLeftPadding : 1;
         bool explicitRightPadding : 1;
         bool explicitBottomPadding : 1;
+        bool explicitImplicitSize : 1;
     };
     QLazilyAllocated<ExtraData> extra;
 
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index c29acf3c83..041baa4199 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -2518,6 +2518,7 @@ QQuickTextInputPrivate::ExtraData::ExtraData()
     , explicitLeftPadding(false)
     , explicitRightPadding(false)
     , explicitBottomPadding(false)
+    , explicitImplicitSize(false)
 {
 }
 
@@ -2820,7 +2821,8 @@ void QQuickTextInputPrivate::updateLayout()
         line.setLineWidth(INT_MAX);
         const bool wasInLayout = inLayout;
         inLayout = true;
-        q->setImplicitWidth(qCeil(line.naturalTextWidth()) + q->leftPadding() + q->rightPadding());
+        if (!extra.isAllocated() || !extra->explicitImplicitSize)
+            q->setImplicitWidth(qCeil(line.naturalTextWidth()) + q->leftPadding() + q->rightPadding());
         inLayout = wasInLayout;
         if (inLayout)       // probably the result of a binding loop, but by letting it
             return;         // get this far we'll get a warning to that effect.
@@ -2851,10 +2853,12 @@ void QQuickTextInputPrivate::updateLayout()
     q->polish();
     q->update();
 
-    if (!requireImplicitWidth && !q->widthValid())
-        q->setImplicitSize(width + q->leftPadding() + q->rightPadding(), height + q->topPadding() + q->bottomPadding());
-    else
-        q->setImplicitHeight(height + q->topPadding() + q->bottomPadding());
+    if (!extra.isAllocated() || !extra->explicitImplicitSize) {
+        if (!requireImplicitWidth && !q->widthValid())
+            q->setImplicitSize(width + q->leftPadding() + q->rightPadding(), height + q->topPadding() + q->bottomPadding());
+        else
+            q->setImplicitHeight(height + q->topPadding() + q->bottomPadding());
+    }
 
     updateBaselineOffset();
 
diff --git a/src/quick/items/qquicktextinput_p_p.h b/src/quick/items/qquicktextinput_p_p.h
index cf0a6f5273..4946adc7e7 100644
--- a/src/quick/items/qquicktextinput_p_p.h
+++ b/src/quick/items/qquicktextinput_p_p.h
@@ -84,6 +84,7 @@ public:
         bool explicitLeftPadding : 1;
         bool explicitRightPadding : 1;
         bool explicitBottomPadding : 1;
+        bool explicitImplicitSize : 1;
     };
     QLazilyAllocated<ExtraData> extra;