2 files changed, 8 insertions, 4 deletions
diff --git a/src/quick/items/qquickloader.cpp b/src/quick/items/qquickloader.cpp
index cd356a9eeb..27afe5a5db 100644
--- a/src/quick/items/qquickloader.cpp
+++ b/src/quick/items/qquickloader.cpp
@@ -916,9 +916,14 @@ void QQuickLoaderPrivate::_q_updateSize(bool loaderGeometryChanged)
     if (!item)
         return;
 
-    if (loaderGeometryChanged && q->widthValid())
+    const bool needToUpdateWidth = loaderGeometryChanged && q->widthValid();
+    const bool needToUpdateHeight = loaderGeometryChanged && q->heightValid();
+
+    if (needToUpdateWidth && needToUpdateHeight)
+        item->setSize(QSizeF(q->width(), q->height()));
+    else if (needToUpdateWidth)
         item->setWidth(q->width());
-    if (loaderGeometryChanged && q->heightValid())
+    else if (needToUpdateHeight)
         item->setHeight(q->height());
 
     if (updatingSize)
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp
index 2e23d69e5b..874c02fc99 100644
--- a/src/quick/items/qquicktextcontrol.cpp
+++ b/src/quick/items/qquicktextcontrol.cpp
@@ -432,6 +432,7 @@ void QQuickTextControlPrivate::selectionChanged(bool forceEmitSelectionChanged /
 #endif
         emit q->selectionChanged();
     }
+    q->updateCursorRectangle(true);
 }
 
 void QQuickTextControlPrivate::_q_updateCurrentCharFormatAndSelection()
@@ -1150,7 +1151,6 @@ void QQuickTextControlPrivate::mouseMoveEvent(QMouseEvent *e, const QPointF &mou
         if (interactionFlags & Qt::TextEditable) {
             if (cursor.position() != oldCursorPos) {
                 emit q->cursorPositionChanged();
-                q->updateCursorRectangle(true);
             }
             _q_updateCurrentCharFormatAndSelection();
 #if QT_CONFIG(im)
@@ -1159,7 +1159,6 @@ void QQuickTextControlPrivate::mouseMoveEvent(QMouseEvent *e, const QPointF &mou
 #endif
         } else if (cursor.position() != oldCursorPos) {
             emit q->cursorPositionChanged();
-            q->updateCursorRectangle(true);
         }
         selectionChanged(true);
         repaintOldAndNewSelection(oldSelection);