whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: QBrush autotest failure on Android and Wayland 

Since Qt 5.5, brush textures are stored as QImages. If the texture has
been set as a QPixmap, the conversion to QImage may change its pixel
format, depending on the native system format. That is acceptable.

Fixes: QTBUG-69193
Task-number: QTBUG-91418
Change-Id: Ic4dbeaa552b1f2183774a011e38414855a9dc4b1
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
bb10
Eirik Aavitsland 2019-02-12 15:56:35 +01:00 committed by Eskil Abrahamsen Blomfeldt
parent 346d30144a
commit bea214e765
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/auto/gui/painting/qbrush/tst_qbrush.cpp
View File

@ -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);
}