1 files changed, 47 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
index 78e03be9c2..d241ac2d70 100644
--- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp
+++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp
@@ -101,6 +101,7 @@ private slots:
     void color();
     void smooth();
     void renderType();
+    void antialiasing();
 
     // QQuickFontValueType
     void weight();
@@ -126,6 +127,7 @@ private slots:
     void clipRect();
     void lineLaidOut();
     void lineLaidOutRelayout();
+    void lineLaidOutHAlign();
 
     void imgTagsBaseUrl_data();
     void imgTagsBaseUrl();
@@ -901,6 +903,8 @@ void tst_qquicktext::hAlignImplicitWidth()
     {
         // HCenter Align
         text->setHAlign(QQuickText::AlignHCenter);
+        text->setText("Reset"); // set dummy string to force relayout once original text is set again
+        text->setText("AA\nBBBBBBB\nCCCCCCCCCCCCCCCC");
         QImage image = view.grabWindow();
         const int left = numberOfNonWhitePixels(centeredSection1, centeredSection2, image);
         const int mid = numberOfNonWhitePixels(centeredSection2, centeredSection3, image);
@@ -911,6 +915,8 @@ void tst_qquicktext::hAlignImplicitWidth()
     {
         // Right Align
         text->setHAlign(QQuickText::AlignRight);
+        text->setText("Reset"); // set dummy string to force relayout once original text is set again
+        text->setText("AA\nBBBBBBB\nCCCCCCCCCCCCCCCC");
         QImage image = view.grabWindow();
         const int left = numberOfNonWhitePixels(centeredSection1, centeredSection2, image);
         const int mid = numberOfNonWhitePixels(centeredSection2, centeredSection3, image);
@@ -1306,6 +1312,30 @@ void tst_qquicktext::renderType()
     QCOMPARE(spy.count(), 2);
 }
 
+void tst_qquicktext::antialiasing()
+{
+    QQmlComponent component(&engine);
+    component.setData("import QtQuick 2.0\n Text {}", QUrl());
+    QScopedPointer<QObject> object(component.create());
+    QQuickText *text = qobject_cast<QQuickText *>(object.data());
+    QVERIFY(text);
+
+    QSignalSpy spy(text, SIGNAL(antialiasingChanged(bool)));
+
+    QCOMPARE(text->antialiasing(), true);
+
+    text->setAntialiasing(false);
+    QCOMPARE(text->antialiasing(), false);
+    QCOMPARE(spy.count(), 1);
+
+    text->setAntialiasing(false);
+    QCOMPARE(spy.count(), 1);
+
+    text->resetAntialiasing();
+    QCOMPARE(text->antialiasing(), true);
+    QCOMPARE(spy.count(), 2);
+}
+
 void tst_qquicktext::weight()
 {
     {
@@ -2630,6 +2660,23 @@ void tst_qquicktext::lineLaidOutRelayout()
     delete window;
 }
 
+void tst_qquicktext::lineLaidOutHAlign()
+{
+    QQuickView *window = createView(testFile("lineLayoutHAlign.qml"));
+
+    QQuickText *myText = window->rootObject()->findChild<QQuickText*>("myText");
+    QVERIFY(myText != 0);
+
+    QQuickTextPrivate *textPrivate = QQuickTextPrivate::get(myText);
+    QVERIFY(textPrivate != 0);
+
+    QCOMPARE(textPrivate->layout.lineCount(), 1);
+
+    QVERIFY(textPrivate->layout.lineAt(0).naturalTextRect().x() < 0.0);
+
+    delete window;
+}
+
 void tst_qquicktext::imgTagsBaseUrl_data()
 {
     QTest::addColumn<QUrl>("src");