Stabilize Loader test.
authorMichael Brasser <michael.brasser@nokia.com>
Tue, 10 Jul 2012 03:10:28 +0000 (13:10 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 10 Jul 2012 05:18:05 +0000 (07:18 +0200)
Wait for Loader to load its item, rather than using
a fixed timeout value.

Change-Id: I97ee56d0d7161c9c71a5524f108b0f56d92cc3f3
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
tests/auto/quick/qquickloader/tst_qquickloader.cpp

index fa09779..99ae42b 100644 (file)
@@ -705,8 +705,10 @@ void tst_QQuickLoader::initialPropertyValues()
     QQmlComponent component(&engine, qmlFile);
     QObject *object = component.create();
     QVERIFY(object != 0);
-    qApp->processEvents();
-    QTest::qWait(50);
+    if (expectedWarnings.isEmpty()) {
+        QQuickLoader *loader = object->findChild<QQuickLoader*>("loader");
+        QTRY_VERIFY(loader->item());
+    }
 
     for (int i = 0; i < propertyNames.size(); ++i)
         QCOMPARE(object->property(propertyNames.at(i).toLatin1().constData()), propertyValues.at(i));