QtDeclarative: replace deprecated functions

Replace the deprecated functions with it successors:
 - QFontMetrics::width() -> horizontalAdvance()
 - QLayout::setMargin() -> setContentsMargins()

Change-Id: I2a2557cdb2eaec40e2c9955a0082372c582ec6b8
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp
index 792aa31a88..d84932b8d0 100644
--- a/src/quick/items/qquicktextnodeengine.cpp
+++ b/src/quick/items/qquicktextnodeengine.cpp
@@ -1007,8 +1007,8 @@ void QQuickTextNodeEngine::addTextBlock(QTextDocument *textDocument, const QText
                 break;
             };
 
-            QSizeF size(fontMetrics.width(listItemBullet), fontMetrics.height());
-            qreal xoff = fontMetrics.width(QLatin1Char(' '));
+            QSizeF size(fontMetrics.horizontalAdvance(listItemBullet), fontMetrics.height());
+            qreal xoff = fontMetrics.horizontalAdvance(QLatin1Char(' '));
             if (block.textDirection() == Qt::LeftToRight)
                 xoff = -xoff - size.width();
             setPosition(pos + QPointF(xoff, 0));