tests: XFAIL a few in tst_QStaticText on Wayland
Task-number: QTBUG-100982 Pick-to: 6.3 6.2 Change-Id: I18cdb79d9261bac40cc619f9d327d0ef7ed722c4 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
parent
e49d2daf19
commit
586fd9e034
@ -106,6 +106,11 @@ private:
|
||||
|
||||
Q_DECLARE_METATYPE(QImage::Format);
|
||||
|
||||
static bool isPlatformWayland()
|
||||
{
|
||||
return QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive);
|
||||
}
|
||||
|
||||
void tst_QStaticText::constructionAndDestruction()
|
||||
{
|
||||
QStaticText text("My text");
|
||||
@ -167,6 +172,8 @@ void tst_QStaticText::drawToPoint()
|
||||
}
|
||||
|
||||
QVERIFY(imageDrawText.toImage() != m_whiteSquare);
|
||||
if (isPlatformWayland())
|
||||
QEXPECT_FAIL("", "Wayland: This fails. See QTBUG-100982.", Abort);
|
||||
QCOMPARE(imageDrawStaticText, imageDrawText);
|
||||
}
|
||||
|
||||
@ -207,6 +214,8 @@ void tst_QStaticText::drawToRect()
|
||||
#endif
|
||||
|
||||
QVERIFY(imageDrawText.toImage() != m_whiteSquare);
|
||||
if (isPlatformWayland())
|
||||
QEXPECT_FAIL("", "Wayland: This fails. See QTBUG-100982.", Abort);
|
||||
QCOMPARE(imageDrawStaticText, imageDrawText);
|
||||
}
|
||||
|
||||
@ -266,6 +275,8 @@ void tst_QStaticText::compareToDrawText()
|
||||
#endif
|
||||
|
||||
QVERIFY(imageDrawText.toImage() != m_whiteSquare);
|
||||
if (isPlatformWayland() && font == QFont())
|
||||
QEXPECT_FAIL("", "Wayland: This fails. See QTBUG-100982.", Abort);
|
||||
QCOMPARE(imageDrawStaticPlainText, imageDrawText);
|
||||
QCOMPARE(imageDrawStaticRichText, imageDrawText);
|
||||
}
|
||||
@ -373,6 +384,8 @@ void tst_QStaticText::setFont()
|
||||
#endif
|
||||
|
||||
QVERIFY(imageDrawText.toImage() != m_whiteSquare);
|
||||
if (isPlatformWayland())
|
||||
QEXPECT_FAIL("", "Wayland: This fails. See QTBUG-100982.", Abort);
|
||||
QCOMPARE(imageDrawStaticText, imageDrawText);
|
||||
}
|
||||
|
||||
@ -396,6 +409,8 @@ void tst_QStaticText::setTextWidth()
|
||||
}
|
||||
|
||||
QVERIFY(imageDrawText.toImage() != m_whiteSquare);
|
||||
if (isPlatformWayland())
|
||||
QEXPECT_FAIL("", "Wayland: This fails. See QTBUG-100982.", Abort);
|
||||
QCOMPARE(imageDrawStaticText, imageDrawText);
|
||||
}
|
||||
|
||||
@ -423,6 +438,8 @@ void tst_QStaticText::translatedPainter()
|
||||
}
|
||||
|
||||
QVERIFY(imageDrawText.toImage() != m_whiteSquare);
|
||||
if (isPlatformWayland())
|
||||
QEXPECT_FAIL("", "Wayland: This fails. See QTBUG-100982.", Abort);
|
||||
QCOMPARE(imageDrawStaticText, imageDrawText);
|
||||
}
|
||||
|
||||
@ -463,6 +480,8 @@ void tst_QStaticText::rotatedPainter()
|
||||
|
||||
if (!supportsTransformations())
|
||||
QEXPECT_FAIL("", "Graphics system does not support transformed text on this platform", Abort);
|
||||
if (isPlatformWayland())
|
||||
QEXPECT_FAIL("", "Wayland: This fails. See QTBUG-100982.", Abort);
|
||||
QCOMPARE(imageDrawStaticText, imageDrawText);
|
||||
}
|
||||
|
||||
@ -493,6 +512,8 @@ void tst_QStaticText::scaledPainter()
|
||||
|
||||
if (!supportsTransformations())
|
||||
QEXPECT_FAIL("", "Graphics system does not support transformed text on this platform", Abort);
|
||||
if (isPlatformWayland())
|
||||
QEXPECT_FAIL("", "Wayland: This fails. See QTBUG-100982.", Abort);
|
||||
QCOMPARE(imageDrawStaticText, imageDrawText);
|
||||
}
|
||||
|
||||
@ -620,6 +641,8 @@ void tst_QStaticText::transformationChanged()
|
||||
|
||||
if (!supportsTransformations())
|
||||
QEXPECT_FAIL("", "Graphics system does not support transformed text on this platform", Abort);
|
||||
if (isPlatformWayland())
|
||||
QEXPECT_FAIL("", "Wayland: This fails. See QTBUG-100982.", Abort);
|
||||
QCOMPARE(imageDrawStaticText, imageDrawText);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user