qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QtQuick: Remove usages of qWaitForWindowShown(QWindow *). 

Change-Id: I722e20b2fb8d8c6c19c6f3f2cb16910d7433e9a4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Friedemann Kleint 2012-07-24 14:56:35 +02:00 committed by Qt by Nokia
parent 3bb7128fb7
commit c20463631d
14 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp
View File

@ -566,8 +566,8 @@ void tst_qquickfocusscope::canvasFocus()
// view->hide(); // seemingly doesn't remove focus, so have an another view steal it. // view->hide(); // seemingly doesn't remove focus, so have an another view steal it.
alternateView.show(); alternateView.show();
alternateView.requestActivateWindow(); alternateView.requestActivateWindow();
QTest::qWaitForWindowShown(&alternateView); QVERIFY(QTest::qWaitForWindowActive(&alternateView));
QTRY_VERIFY(QGuiApplication::focusWindow() == &alternateView); QVERIFY(QGuiApplication::focusWindow() == &alternateView);
QCOMPARE(rootItem->hasFocus(), false); QCOMPARE(rootItem->hasFocus(), false);
QCOMPARE(rootItem->hasActiveFocus(), false); QCOMPARE(rootItem->hasActiveFocus(), false);

4
tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp
View File

@ -251,8 +251,8 @@ void tst_qquickfontloader::changeFontSourceViaState()
QQuickView window(testFileUrl("qtbug-20268.qml")); QQuickView window(testFileUrl("qtbug-20268.qml"));
window.show(); window.show();
window.requestActivateWindow(); window.requestActivateWindow();
QTest::qWaitForWindowShown(&window); QVERIFY(QTest::qWaitForWindowActive(&window));
QTRY_COMPARE(&window, qGuiApp->focusWindow()); QCOMPARE(&window, qGuiApp->focusWindow());
QQuickFontLoader *fontObject = qobject_cast<QQuickFontLoader*>(qvariant_cast<QObject *>(window.rootObject()->property("fontloader"))); QQuickFontLoader *fontObject = qobject_cast<QQuickFontLoader*>(qvariant_cast<QObject *>(window.rootObject()->property("fontloader")));
QVERIFY(fontObject != 0); QVERIFY(fontObject != 0);

2
tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
View File

@ -4165,7 +4165,7 @@ void tst_QQuickGridView::columnCount()
window.setSource(testFileUrl("gridview4.qml")); window.setSource(testFileUrl("gridview4.qml"));
window.show(); window.show();
window.requestActivateWindow(); window.requestActivateWindow();
QTest::qWaitForWindowShown(&window); QVERIFY(QTest::qWaitForWindowActive(&window));
QQuickGridView *view = qobject_cast<QQuickGridView*>(window.rootObject()); QQuickGridView *view = qobject_cast<QQuickGridView*>(window.rootObject());

2
tests/auto/quick/qquickimage/tst_qquickimage.cpp
View File

@ -499,7 +499,7 @@ void tst_qquickimage::tiling_QTBUG_6716()
QQuickView view(testFileUrl(source)); QQuickView view(testFileUrl(source));
view.show(); view.show();
view.requestActivateWindow(); view.requestActivateWindow();
QTest::qWaitForWindowShown(&view); QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickImage *tiling = findItem<QQuickImage>(view.rootObject(), "tiling"); QQuickImage *tiling = findItem<QQuickImage>(view.rootObject(), "tiling");

6
tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
View File

@ -59,7 +59,7 @@ public:
view.setSource(testFileUrl(fileName)); view.setSource(testFileUrl(fileName));
view.show(); view.show();
QTest::qWaitForWindowShown(&view); QTest::qWaitForWindowExposed(&view);
return view.grabWindow(); return view.grabWindow();
} }
@ -310,7 +310,7 @@ void tst_QQuickItemLayer::layerZOrder()
view.show(); view.show();
QTest::qWaitForWindowShown(&view); QVERIFY(QTest::qWaitForWindowExposed(&view));
QImage fb = view.grabWindow(); QImage fb = view.grabWindow();
@ -347,7 +347,7 @@ void tst_QQuickItemLayer::changeZOrder()
view.show(); view.show();
QTest::qWaitForWindowShown(&view); QVERIFY(QTest::qWaitForWindowExposed(&view));
QImage fb = view.grabWindow(); QImage fb = view.grabWindow();

2
tests/auto/quick/qquickpainteditem/tst_qquickpainteditem.cpp
View File

@ -104,7 +104,7 @@ void tst_QQuickPaintedItem::initTestCase()
{ {
window.resize(320, 240); window.resize(320, 240);
window.show(); window.show();
QTest::qWaitForWindowShown(&window); QVERIFY(QTest::qWaitForWindowExposed(&window));
} }
void tst_QQuickPaintedItem::update() void tst_QQuickPaintedItem::update()

8
tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
View File

@ -1927,8 +1927,8 @@ void tst_QQuickPathView::positionViewAtIndex()
window->setSource(testFileUrl("pathview3.qml")); window->setSource(testFileUrl("pathview3.qml"));
window->show(); window->show();
window->requestActivateWindow(); window->requestActivateWindow();
QTest::qWaitForWindowShown(window); QVERIFY(QTest::qWaitForWindowActive(window));
QTRY_COMPARE(window, qGuiApp->focusWindow()); QCOMPARE(window, qGuiApp->focusWindow());
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject()); QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
QVERIFY(pathview != 0); QVERIFY(pathview != 0);
@ -1991,8 +1991,8 @@ void tst_QQuickPathView::indexAt_itemAt()
window->setSource(testFileUrl("pathview3.qml")); window->setSource(testFileUrl("pathview3.qml"));
window->show(); window->show();
window->requestActivateWindow(); window->requestActivateWindow();
QTest::qWaitForWindowShown(window); QVERIFY(QTest::qWaitForWindowActive(window));
QTRY_COMPARE(window, qGuiApp->focusWindow()); QCOMPARE(window, qGuiApp->focusWindow());
QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject()); QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
QVERIFY(pathview != 0); QVERIFY(pathview != 0);

2
tests/auto/quick/qquickscreen/tst_qquickscreen.cpp
View File

@ -58,7 +58,7 @@ void tst_qquickscreen::basicProperties()
QQuickView view; QQuickView view;
view.setSource(testFileUrl("screen.qml")); view.setSource(testFileUrl("screen.qml"));
view.show(); view.show();
QTest::qWaitForWindowShown(&view); QVERIFY(QTest::qWaitForWindowExposed(&view));
QQuickItem* root = view.rootObject(); QQuickItem* root = view.rootObject();
QVERIFY(root); QVERIFY(root);

8
tests/auto/quick/qquicktext/tst_qquicktext.cpp
View File

@ -866,7 +866,7 @@ void tst_qquicktext::hAlignImplicitWidth()
QQuickView view(testFileUrl("hAlignImplicitWidth.qml")); QQuickView view(testFileUrl("hAlignImplicitWidth.qml"));
view.show(); view.show();
view.requestActivateWindow(); view.requestActivateWindow();
QTest::qWaitForWindowShown(&view); QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickText *text = view.rootObject()->findChild<QQuickText*>("textItem"); QQuickText *text = view.rootObject()->findChild<QQuickText*>("textItem");
QVERIFY(text != 0); QVERIFY(text != 0);
@ -1270,7 +1270,7 @@ void tst_qquicktext::underline()
QQuickView view(testFileUrl("underline.qml")); QQuickView view(testFileUrl("underline.qml"));
view.show(); view.show();
view.requestActivateWindow(); view.requestActivateWindow();
QTest::qWaitForWindowShown(&view); QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText"); QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText");
QVERIFY(textObject != 0); QVERIFY(textObject != 0);
QCOMPARE(textObject->font().overline(), false); QCOMPARE(textObject->font().overline(), false);
@ -1283,7 +1283,7 @@ void tst_qquicktext::overline()
QQuickView view(testFileUrl("overline.qml")); QQuickView view(testFileUrl("overline.qml"));
view.show(); view.show();
view.requestActivateWindow(); view.requestActivateWindow();
QTest::qWaitForWindowShown(&view); QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText"); QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText");
QVERIFY(textObject != 0); QVERIFY(textObject != 0);
QCOMPARE(textObject->font().overline(), true); QCOMPARE(textObject->font().overline(), true);
@ -1296,7 +1296,7 @@ void tst_qquicktext::strikeout()
QQuickView view(testFileUrl("strikeout.qml")); QQuickView view(testFileUrl("strikeout.qml"));
view.show(); view.show();
view.requestActivateWindow(); view.requestActivateWindow();
QTest::qWaitForWindowShown(&view); QVERIFY(QTest::qWaitForWindowActive(&view));
QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText"); QQuickText *textObject = view.rootObject()->findChild<QQuickText*>("myText");
QVERIFY(textObject != 0); QVERIFY(textObject != 0);
QCOMPARE(textObject->font().overline(), false); QCOMPARE(textObject->font().overline(), false);

4
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp
View File

@ -586,7 +586,7 @@ void tst_qquicktextedit::alignments()
QQuickView window(testFileUrl("alignments.qml")); QQuickView window(testFileUrl("alignments.qml"));
window.show(); window.show();
QTest::qWaitForWindowShown(&window); QVERIFY(QTest::qWaitForWindowExposed(&window));
QObject *ob = window.rootObject(); QObject *ob = window.rootObject();
QVERIFY(ob != 0); QVERIFY(ob != 0);
@ -815,7 +815,7 @@ void tst_qquicktextedit::hAlignVisual()
{ {
QQuickView view(testFileUrl("hAlignVisual.qml")); QQuickView view(testFileUrl("hAlignVisual.qml"));
view.show(); view.show();
QTest::qWaitForWindowShown(&view); QVERIFY(QTest::qWaitForWindowExposed(&view));
QQuickText *text = view.rootObject()->findChild<QQuickText*>("textItem"); QQuickText *text = view.rootObject()->findChild<QQuickText*>("textItem");
QVERIFY(text != 0); QVERIFY(text != 0);

2
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
View File

@ -1282,7 +1282,7 @@ void tst_qquicktextinput::horizontalAlignment()
QQuickView window(testFileUrl("horizontalAlignment.qml")); QQuickView window(testFileUrl("horizontalAlignment.qml"));
window.show(); window.show();
QTest::qWaitForWindowShown(&window); QVERIFY(QTest::qWaitForWindowExposed(&window));
QObject *ob = window.rootObject(); QObject *ob = window.rootObject();
QVERIFY(ob != 0); QVERIFY(ob != 0);

2
tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp
View File

@ -796,7 +796,7 @@ void tst_qquickvisualdatamodel::itemsDestroyed()
view.setSource(source); view.setSource(source);
view.show(); view.show();
QTest::qWaitForWindowShown(&view); QVERIFY(QTest::qWaitForWindowExposed(&view));
QVERIFY(delegate = findItem<QQuickItem>(view.rootItem(), "delegate", 1)); QVERIFY(delegate = findItem<QQuickItem>(view.rootItem(), "delegate", 1));
} }

2
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
View File

@ -869,7 +869,7 @@ void tst_qquickwindow::grab()
window.resize(250, 250); window.resize(250, 250);
window.show(); window.show();
QTest::qWaitForWindowShown(&window); QVERIFY(QTest::qWaitForWindowExposed(&window));
QImage content = window.grabWindow(); QImage content = window.grabWindow();
QCOMPARE(content.width(), window.width()); QCOMPARE(content.width(), window.width());

2
tests/auto/quick/rendernode/tst_rendernode.cpp
View File

@ -60,7 +60,7 @@ public:
view.setSource(testFileUrl(fileName)); view.setSource(testFileUrl(fileName));
view.show(); view.show();
QTest::qWaitForWindowShown(&view); QTest::qWaitForWindowExposed(&view);
return view.grabWindow(); return view.grabWindow();
} }