diff options
author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-07-01 12:21:01 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-07-01 12:29:46 +0200 |
commit | 2b0f8a7b8c414c9afe383178a768cbac33f5baae (patch) | |
tree | 6c6327fce2f424a4d6f4eef1efa28dcbd99ad27a /tests/auto/quick/qquicktext | |
parent | b975f80dd4fb0e59c751ae9de7740d9da92c4693 (diff) |
Mark failing testcases with QEXPECT_FAIL for windows
Task-number: QTBUG-39961
Change-Id: I981159921b38ac2af37e8a6d715f0d67d6f01da8
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'tests/auto/quick/qquicktext')
-rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index 6167577b60..f361c25a05 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -2943,6 +2943,8 @@ 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); @@ -3447,6 +3449,8 @@ 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); |