1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QGraphicsView tests: Prefer exposed over active

Browse Source 
Makes the tests pass on Wayland.

Task-number: QTBUG-62188
Change-Id: I5860c1ae6dd3d15632d827f4e357cb6c2cc9c5e3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Johan Klokkhammer Helsing 2019-10-11 10:08:23 +02:00
parent ee4a604a2e
commit 4b5ff2be7c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
View File

@ -826,7 +826,7 @@ void tst_QFileSystemModel::sort()
tree.setModel(myModel.data()); tree.setModel(myModel.data());
tree.show(); tree.show();
tree.resize(800, 800); tree.resize(800, 800);
QVERIFY(QTest::qWaitForWindowActive(&tree)); QVERIFY(QTest::qWaitForWindowExposed(&tree));
tree.header()->setSortIndicator(1, Qt::DescendingOrder); tree.header()->setSortIndicator(1, Qt::DescendingOrder);
tree.header()->setSectionResizeMode(0, QHeaderView::ResizeToContents); tree.header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
QStringList dirsToOpen; QStringList dirsToOpen;

2
tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
View File

@ -166,7 +166,7 @@ void tst_QGraphicsEffectSource::initTestCase()
scene->addItem(item); scene->addItem(item);
view = new QGraphicsView(scene); view = new QGraphicsView(scene);
view->show(); view->show();
QVERIFY(QTest::qWaitForWindowActive(view)); QVERIFY(QTest::qWaitForWindowExposed(view));
} }
void tst_QGraphicsEffectSource::cleanupTestCase() void tst_QGraphicsEffectSource::cleanupTestCase()

2
tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
View File

@ -1826,7 +1826,7 @@ void tst_QGraphicsGridLayout::removeLayout()
QGraphicsView view(&scene); QGraphicsView view(&scene);
view.show(); view.show();
QVERIFY(QTest::qWaitForWindowActive(&view)); QVERIFY(QTest::qWaitForWindowExposed(&view));
QRectF r1 = textEdit->geometry(); QRectF r1 = textEdit->geometry();
QRectF r2 = pushButton->geometry(); QRectF r2 = pushButton->geometry();

2
tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
View File

@ -1518,7 +1518,7 @@ void tst_QGraphicsLinearLayout::removeLayout()
QGraphicsView view(&scene); QGraphicsView view(&scene);
view.show(); view.show();
QVERIFY(QTest::qWaitForWindowActive(&view)); QVERIFY(QTest::qWaitForWindowExposed(&view));
QRectF r1 = textEdit->geometry(); QRectF r1 = textEdit->geometry();
QRectF r2 = pushButton->geometry(); QRectF r2 = pushButton->geometry();