diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2021-03-01 08:58:41 +0100 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-11 10:52:55 +0000 |
| commit | 3416e5423eeb10bdcde59a8ed3aedf9e987bafd2 (patch) | |
| tree | f991df4da1f826b5767ae54011e5cb14f78f16e1 /tests/auto/gui | |
| parent | 1f36e5ebd1d94ac410dd151a37a04e32e77bc29b (diff) | |
| parent | 100840a4fbe4e1dbbda32b51fe75469b9341db6d (diff) | |
Merge "Fix tst_qgraphicseffect on Wayland"
Diffstat (limited to 'tests/auto/gui')
| -rw-r--r-- | tests/auto/gui/painting/qbrush/tst_qbrush.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp index 490d127efc..ea380e3cc9 100644 --- a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp +++ b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp @@ -456,10 +456,9 @@ void tst_QBrush::textureBrushStream() QCOMPARE(loadedBrush1.style(), Qt::TexturePattern); QCOMPARE(loadedBrush2.style(), Qt::TexturePattern); -#ifdef Q_OS_ANDROID - QEXPECT_FAIL("", "QTBUG-69193", Continue); -#endif - QCOMPARE(loadedBrush1.texture(), pixmap_source); + // pixmaps may have been converted to system format + QCOMPARE(loadedBrush1.texture().toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied), + pixmap_source.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied)); QCOMPARE(loadedBrush2.textureImage(), image_source); } |