1 files changed, 40 insertions, 22 deletions

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index ad904a2579..beb2039924 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -88,6 +88,7 @@ QQuickTextPrivate::QQuickTextPrivate()
     , truncated(false), hAlignImplicit(true), rightToLeftText(false)
     , layoutTextElided(false), textHasChanged(true), needToUpdateLayout(false), formatModifiesFontSize(false)
 {
+    implicitAntialiasing = true;
 }
 
 QQuickTextPrivate::ExtraData::ExtraData()
@@ -114,6 +115,7 @@ QQuickTextDocumentWithImageResources::QQuickTextDocumentWithImageResources(QQuic
 {
     setUndoRedoEnabled(false);
     documentLayout()->registerHandler(QTextFormat::ImageObject, this);
+    connect(this, SIGNAL(baseUrlChanged(QUrl)), this, SLOT(reset()));
 }
 
 QQuickTextDocumentWithImageResources::~QQuickTextDocumentWithImageResources()
@@ -125,14 +127,13 @@ QQuickTextDocumentWithImageResources::~QQuickTextDocumentWithImageResources()
 QVariant QQuickTextDocumentWithImageResources::loadResource(int type, const QUrl &name)
 {
     QQmlContext *context = qmlContext(parent());
-    QUrl url = m_baseUrl.resolved(name);
 
     if (type == QTextDocument::ImageResource) {
-        QQuickPixmap *p = loadPixmap(context, url);
+        QQuickPixmap *p = loadPixmap(context, name);
         return p->image();
     }
 
-    return QTextDocument::loadResource(type,url); // The *resolved* URL
+    return QTextDocument::loadResource(type, name);
 }
 
 void QQuickTextDocumentWithImageResources::requestFinished()
@@ -144,14 +145,6 @@ void QQuickTextDocumentWithImageResources::requestFinished()
     }
 }
 
-void QQuickTextDocumentWithImageResources::clear()
-{
-    clearResources();
-
-    QTextDocument::clear();
-}
-
-
 QSizeF QQuickTextDocumentWithImageResources::intrinsicSize(
         QTextDocument *, int, const QTextFormat &format)
 {
@@ -166,7 +159,7 @@ QSizeF QQuickTextDocumentWithImageResources::intrinsicSize(
         QSizeF size(width, height);
         if (!hasWidth || !hasHeight) {
             QQmlContext *context = qmlContext(parent());
-            QUrl url = m_baseUrl.resolved(QUrl(imageFormat.name()));
+            QUrl url = baseUrl().resolved(QUrl(imageFormat.name()));
 
             QQuickPixmap *p = loadPixmap(context, url);
             if (!p->isReady()) {
@@ -204,19 +197,16 @@ void QQuickTextDocumentWithImageResources::drawObject(
 QImage QQuickTextDocumentWithImageResources::image(const QTextImageFormat &format)
 {
     QQmlContext *context = qmlContext(parent());
-    QUrl url = m_baseUrl.resolved(QUrl(format.name()));
+    QUrl url = baseUrl().resolved(QUrl(format.name()));
 
     QQuickPixmap *p = loadPixmap(context, url);
     return p->image();
 }
 
-void QQuickTextDocumentWithImageResources::setBaseUrl(const QUrl &url, bool clear)
+void QQuickTextDocumentWithImageResources::reset()
 {
-    m_baseUrl = url;
-    if (clear) {
-        clearResources();
-        markContentsDirty(0, characterCount());
-    }
+    clearResources();
+    markContentsDirty(0, characterCount());
 }
 
 QQuickPixmap *QQuickTextDocumentWithImageResources::loadPixmap(
@@ -297,6 +287,15 @@ qreal QQuickTextPrivate::getImplicitHeight() const
     return implicitHeight;
 }
 
+/*!
+    \qmlproperty bool QtQuick::Text::antialiasing
+
+    Used to decide if the Text should use antialiasing or not. Only Text
+    with renderType of Text.NativeRendering can disable antialiasing.
+
+    The default is true.
+*/
+
 void QQuickText::q_imagesLoaded()
 {
     Q_D(QQuickText);
@@ -620,8 +619,9 @@ void QQuickTextPrivate::setupCustomLineGeometry(QTextLine &line, qreal &height,
     textLine->setHeight(0);
     textLine->setLineOffset(lineOffset);
 
-    // use the text item's width by default if it has one and wrap is on
-    if (q->widthValid() && q->wrapMode() != QQuickText::NoWrap)
+    // use the text item's width by default if it has one and wrap is on or text must be aligned
+    if (q->widthValid() && (q->wrapMode() != QQuickText::NoWrap ||
+                            q->effectiveHAlign() != QQuickText::AlignLeft))
         textLine->setWidth(q->width());
     else
         textLine->setWidth(INT_MAX);
@@ -959,7 +959,7 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline)
 
             // If the horizontal alignment is not left and the width was not valid we need to relayout
             // now that we know the maximum line width.
-            if (!implicitWidthValid && lineCount > 1 && q->effectiveHAlign() != QQuickText::AlignLeft) {
+            if (!implicitWidthValid && unwrappedLineCount > 1 && q->effectiveHAlign() != QQuickText::AlignLeft) {
                 widthExceeded = false;
                 heightExceeded = false;
                 continue;
@@ -1415,6 +1415,9 @@ void QQuickText::setFont(const QFont &font)
     QFont oldFont = d->font;
     d->font = font;
 
+    if (!antialiasing())
+        d->font.setStyleStrategy(QFont::NoAntialias);
+
     if (d->font.pointSizeF() != -1) {
         // 0.5pt resolution
         qreal size = qRound(d->font.pointSizeF()*2.0);
@@ -1434,6 +1437,21 @@ void QQuickText::setFont(const QFont &font)
     emit fontChanged(d->sourceFont);
 }
 
+void QQuickText::itemChange(ItemChange change, const ItemChangeData &value)
+{
+    Q_D(QQuickText);
+    Q_UNUSED(value);
+    if (change == ItemAntialiasingHasChanged) {
+        if (!antialiasing())
+            d->font.setStyleStrategy(QFont::NoAntialias);
+        else
+            d->font.setStyleStrategy(QFont::PreferAntialias);
+        d->implicitWidthValid = false;
+        d->implicitHeightValid = false;
+        d->updateLayout();
+    }
+}
+
 /*!
     \qmlproperty string QtQuick::Text::text