diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-17 06:58:40 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-17 06:58:40 (GMT) |
commit | f5668a63a9396b8f21a62a3a780f1e0023715806 (patch) | |
tree | 88cad63bd0dfea70bcf54e3eed57b8a11189fd29 /tests/auto/declarative/qmlecmascript | |
parent | fd3f9dd0f31efeea3aa0ec28b54c70d85712c7ba (diff) | |
parent | 060d833d3e0fd5a99876e0717fb26ef93fae30e1 (diff) | |
download | Qt-f5668a63a9396b8f21a62a3a780f1e0023715806.zip Qt-f5668a63a9396b8f21a62a3a780f1e0023715806.tar.gz Qt-f5668a63a9396b8f21a62a3a780f1e0023715806.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits)
Add missing NOTIFY signals to various QML item class properties
Fix currentIndex after itemsMoved()
qmlviewer: build on symbian
Revert "Replace QList<>* support with QmlListProperty"
Declare QmlXmlListModelRole meta type before any code uses it.
Make compile on Symbian (call Q_DECLARE_METATYPE earlier)
Conditionally link webkit on wince
Revert "Run dos2unix on these files."
Expose LayoutItem documentation
Fix palette on the N900
Fix QTBUG-8090, improve original patch effectiveness.
Replace QList<>* support with QmlListProperty
Run dos2unix on these files.
Remove standalone QmlDebugger. It is now only available through the
Mobility 404
Fix crash in QmlMetaProperty that could occur when using value-type
QML binding optimizer crash
QML binding optimizer crash
Fix crash in QML binding optimizer
Don't delete binding directly
...
Diffstat (limited to 'tests/auto/declarative/qmlecmascript')
-rw-r--r-- | tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp index a6baf10..54f02a2 100644 --- a/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp +++ b/tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp @@ -45,7 +45,7 @@ #include <QtDeclarative/qmlcontext.h> #include <QtCore/qfileinfo.h> #include <QtCore/qdebug.h> -#include <QtCore/private/qguard_p.h> +#include <QtDeclarative/private/qmlguard_p.h> #include <QtCore/qdir.h> #include <QtCore/qnumeric.h> #include <private/qmlengine_p.h> @@ -835,9 +835,9 @@ void tst_qmlecmascript::dynamicCreation() void tst_qmlecmascript::dynamicDestruction() { QmlComponent component(&engine, TEST_FILE("dynamicDeletion.qml")); - QGuard<MyQmlObject> object = qobject_cast<MyQmlObject*>(component.create()); + QmlGuard<MyQmlObject> object = qobject_cast<MyQmlObject*>(component.create()); QVERIFY(object != 0); - QGuard<QObject> createdQmlObject = 0; + QmlGuard<QObject> createdQmlObject = 0; QMetaObject::invokeMethod(object, "create"); createdQmlObject = object->objectProperty(); @@ -846,10 +846,9 @@ void tst_qmlecmascript::dynamicDestruction() QMetaObject::invokeMethod(object, "killOther"); QVERIFY(createdQmlObject); - QTest::qWait(0); QCoreApplication::instance()->processEvents(QEventLoop::DeferredDeletion); QVERIFY(createdQmlObject); - for (int ii = 0; createdQmlObject && ii < 10; ++ii) { + for (int ii = 0; createdQmlObject && ii < 50; ++ii) { // After 5 seconds we should give up if (createdQmlObject) { QTest::qWait(100); QCoreApplication::instance()->processEvents(QEventLoop::DeferredDeletion); |