// view->hide(); // seemingly doesn't remove focus, so have an another view steal it.
alternateView.show();
alternateView.requestActivateWindow();
- QTest::qWaitForWindowShown(&alternateView);
- QTRY_VERIFY(QGuiApplication::focusWindow() == &alternateView);
+ QVERIFY(QTest::qWaitForWindowActive(&alternateView));
+ QVERIFY(QGuiApplication::focusWindow() == &alternateView);
QCOMPARE(rootItem->hasFocus(), false);
QCOMPARE(rootItem->hasActiveFocus(), false);
QQuickView window(testFileUrl("qtbug-20268.qml"));
window.show();
window.requestActivateWindow();
- QTest::qWaitForWindowShown(&window);
- QTRY_COMPARE(&window, qGuiApp->focusWindow());
+ QVERIFY(QTest::qWaitForWindowActive(&window));
+ QCOMPARE(&window, qGuiApp->focusWindow());
QQuickFontLoader *fontObject = qobject_cast<QQuickFontLoader*>(qvariant_cast<QObject *>(window.rootObject()->property("fontloader")));
QVERIFY(fontObject != 0);
window.setSource(testFileUrl("gridview4.qml"));
window.show();
window.requestActivateWindow();
- QTest::qWaitForWindowShown(&window);
+ QVERIFY(QTest::qWaitForWindowActive(&window));
QQuickGridView *view = qobject_cast<QQuickGridView*>(window.rootObject());
QQuickView view(testFileUrl(source));
view.show();
view.requestActivateWindow();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickImage *tiling = findItem<QQuickImage>(view.rootObject(), "tiling");
view.setSource(testFileUrl(fileName));
view.show();
- QTest::qWaitForWindowShown(&view);
+ QTest::qWaitForWindowExposed(&view);
return view.grabWindow();
}
view.show();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowExposed(&view));
QImage fb = view.grabWindow();
view.show();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowExposed(&view));
QImage fb = view.grabWindow();
{
window.resize(320, 240);
window.show();
- QTest::qWaitForWindowShown(&window);
+ QVERIFY(QTest::qWaitForWindowExposed(&window));
}
void tst_QQuickPaintedItem::update()
window->setSource(testFileUrl("pathview3.qml"));
window->show();
window->requestActivateWindow();
- QTest::qWaitForWindowShown(window);
- QTRY_COMPARE(window, qGuiApp->focusWindow());
+ QVERIFY(QTest::qWaitForWindowActive(window));
+ QCOMPARE(window, qGuiApp->focusWindow());
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
QVERIFY(pathview != 0);
window->setSource(testFileUrl("pathview3.qml"));
window->show();
window->requestActivateWindow();
- QTest::qWaitForWindowShown(window);
- QTRY_COMPARE(window, qGuiApp->focusWindow());
+ QVERIFY(QTest::qWaitForWindowActive(window));
+ QCOMPARE(window, qGuiApp->focusWindow());
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
QVERIFY(pathview != 0);
QQuickView view;
view.setSource(testFileUrl("screen.qml"));
view.show();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowExposed(&view));
QQuickItem* root = view.rootObject();
QVERIFY(root);
QQuickView view(testFileUrl("hAlignImplicitWidth.qml"));
view.show();
view.requestActivateWindow();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickText *text = view.rootObject()->findChild<QQuickText*>("textItem");
QVERIFY(text != 0);
QQuickView view(testFileUrl("underline.qml"));
view.show();
view.requestActivateWindow();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText");
QVERIFY(textObject != 0);
QCOMPARE(textObject->font().overline(), false);
QQuickView view(testFileUrl("overline.qml"));
view.show();
view.requestActivateWindow();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText");
QVERIFY(textObject != 0);
QCOMPARE(textObject->font().overline(), true);
QQuickView view(testFileUrl("strikeout.qml"));
view.show();
view.requestActivateWindow();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText");
QVERIFY(textObject != 0);
QCOMPARE(textObject->font().overline(), false);
QQuickView window(testFileUrl("alignments.qml"));
window.show();
- QTest::qWaitForWindowShown(&window);
+ QVERIFY(QTest::qWaitForWindowExposed(&window));
QObject *ob = window.rootObject();
QVERIFY(ob != 0);
{
QQuickView view(testFileUrl("hAlignVisual.qml"));
view.show();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowExposed(&view));
QQuickText *text = view.rootObject()->findChild<QQuickText*>("textItem");
QVERIFY(text != 0);
QQuickView window(testFileUrl("horizontalAlignment.qml"));
window.show();
- QTest::qWaitForWindowShown(&window);
+ QVERIFY(QTest::qWaitForWindowExposed(&window));
QObject *ob = window.rootObject();
QVERIFY(ob != 0);
view.setSource(source);
view.show();
- QTest::qWaitForWindowShown(&view);
+ QVERIFY(QTest::qWaitForWindowExposed(&view));
QVERIFY(delegate = findItem<QQuickItem>(view.rootItem(), "delegate", 1));
}
window.resize(250, 250);
window.show();
- QTest::qWaitForWindowShown(&window);
+ QVERIFY(QTest::qWaitForWindowExposed(&window));
QImage content = window.grabWindow();
QCOMPARE(content.width(), window.width());
view.setSource(testFileUrl(fileName));
view.show();
- QTest::qWaitForWindowShown(&view);
+ QTest::qWaitForWindowExposed(&view);
return view.grabWindow();
}