Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: I762e578aaf14a77efa26ce3fda2abb0e335003ea

1 files changed, 14 insertions, 2 deletions

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index e37a7e6d5e..965fb0102f 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -1135,7 +1135,7 @@ void QQuickTextPrivate::setLineGeometry(QTextLine &line, qreal lineWidth, qreal
                             needToUpdateLayout = true;
                         }
                     } else if (image->pix->isError()) {
-                        qmlInfo(q) << image->pix->error();
+                        qmlWarning(q) << image->pix->error();
                     }
                 }
 
@@ -2795,11 +2795,23 @@ void QQuickText::setRenderType(QQuickText::RenderType renderType)
 
 /*!
     \qmlmethod QtQuick::Text::doLayout()
+    \deprecated
 
-    Triggers a re-layout of the displayed text.
+    Use \l forceLayout() instead.
 */
 void QQuickText::doLayout()
 {
+    forceLayout();
+}
+
+/*!
+    \qmlmethod QtQuick::Text::forceLayout()
+    \since 5.9
+
+    Triggers a re-layout of the displayed text.
+*/
+void QQuickText::forceLayout()
+{
     Q_D(QQuickText);
     d->updateSize();
 }