AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix tst_qgraphicseffect on Wayland"

Browse Source
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2021-03-01 08:58:41 +01:00 committed by Qt CI Bot
commit 3416e5423e
2 changed files with 4 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(loadedBrush1.style(), Qt::TexturePattern);
QCOMPARE(loadedBrush2.style(), Qt::TexturePattern); QCOMPARE(loadedBrush2.style(), Qt::TexturePattern);
#ifdef Q_OS_ANDROID // pixmaps may have been converted to system format
QEXPECT_FAIL("", "QTBUG-69193", Continue); QCOMPARE(loadedBrush1.texture().toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied),
#endif pixmap_source.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied));
QCOMPARE(loadedBrush1.texture(), pixmap_source);
QCOMPARE(loadedBrush2.textureImage(), image_source); QCOMPARE(loadedBrush2.textureImage(), image_source);
} }

1
tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp
View File

@ -694,6 +694,7 @@ void tst_QGraphicsEffect::prepareGeometryChangeInvalidateCache()
QGraphicsView view(&scene); QGraphicsView view(&scene);
view.show(); view.show();
QVERIFY(QTest::qWaitForWindowExposed(&view)); QVERIFY(QTest::qWaitForWindowExposed(&view));
QTRY_VERIFY(view.windowHandle()->isActive());
QTRY_VERIFY(item->nbPaint >= 1); QTRY_VERIFY(item->nbPaint >= 1);
item->nbPaint = 0; item->nbPaint = 0;