diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2014-07-21 16:06:57 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2014-07-22 12:44:39 +0200 |
| commit | 37ea046a6f7973d625d206a1db3f1f83dbbf017e (patch) | |
| tree | 8059a868275451a9d077ce77f97e6c2ab09577cf /tests/auto/quick/qquicktext | |
| parent | 71a1288e3d9601d24545ab9650cd079c40766a63 (diff) | |
Remove XFAILs from tst_QQuickText
The bug for these has been fixed.
Task-number: QTBUG-39961
Change-Id: I306dff766f048faf527a18f21b69996641fd8b79
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/quick/qquicktext')
| -rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index f361c25a05..6167577b60 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -2943,8 +2943,6 @@ void tst_qquicktext::fontSizeMode() // Font size reduced to fit within the width of the item. qreal horizontalFitWidth = myText->contentWidth(); qreal horizontalFitHeight = myText->contentHeight(); - if (QGuiApplication::platformName() == QStringLiteral("windows")) - QEXPECT_FAIL("styled", "QTBUG-39961", Abort); QVERIFY(horizontalFitWidth <= myText->width() + 2); // rounding QVERIFY(horizontalFitHeight <= myText->height() + 2); @@ -3449,8 +3447,6 @@ void tst_qquicktext::multilengthStrings() myText->setSize(QSizeF(mediumWidth, mediumHeight)); QTRY_COMPARE(QQuickItemPrivate::get(myText)->polishScheduled, false); - if (QGuiApplication::platformName() == QStringLiteral("windows")) - QEXPECT_FAIL("Wrap", "QTBUG-39961", Abort); QCOMPARE(myText->contentWidth(), mediumWidth); QCOMPARE(myText->contentHeight(), mediumHeight); QCOMPARE(myText->truncated(), true); |