diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-22 08:23:18 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-22 08:23:18 (GMT) |
commit | 35b8de5c9717a8e57584e9a1a8a9ae6cf668897f (patch) | |
tree | 573503dd1c8b0efcef4f75b63b29a9363ba2487a /tests/auto/declarative/qdeclarativeqt | |
parent | 3ba4e43507cc2ca1f642a45aec4fda4bd3572678 (diff) | |
parent | 5efe6549e5248fbe5b20c8a18fec64d248d7b87c (diff) | |
download | Qt-35b8de5c9717a8e57584e9a1a8a9ae6cf668897f.zip Qt-35b8de5c9717a8e57584e9a1a8a9ae6cf668897f.tar.gz Qt-35b8de5c9717a8e57584e9a1a8a9ae6cf668897f.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (23 commits)
Fix Loader crash.
Compile in namespace
Deprecate inline Script {} blocks
Update metaobjectbuilder version test.
Set role names for QFileSystemModel and QDirModel
Removed wrong parenthesis around property NOTIFY declaration
Remove dead performance measurement code from QML
Fix warning mentioned in the comments of QTBUG-9182.
Fix test.
Ensure positioner animations are triggered correctly
Fix qdeclarativeqt::createQmlObject autotest
Add MiddleButton = MidButton to MouseButtons enum.
Fix qdeclarativetextedit::delegateLoading autotest
Fix Behavior documentation due to easing changes.
Fix crash when calling createObject on a component with errors.
Initialize variable.
Produce an error when trying to create objects in a PropertyChanges.
Fix Flipable crash.
Reduce amount of qmldir parsing
Fix local type lookup
...
Diffstat (limited to 'tests/auto/declarative/qdeclarativeqt')
-rw-r--r-- | tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml | 4 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml b/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml index 9150782..54a3e7d 100644 --- a/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml +++ b/tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml @@ -7,7 +7,7 @@ Item { property bool incorrectArgCount2: false property bool emptyArg: false property bool noParent: false - property bool notReady: false + property bool notAvailable: false property bool runtimeError: false property bool errors: false @@ -20,7 +20,7 @@ Item { emptyArg = (createQmlObject("", root) == null); errors = (createQmlObject("import Qt 4.6\nQtObject{\nproperty int test: 13\nproperty int test: 13\n}", root, "main.qml") == null); noParent = (createQmlObject("import Qt 4.6\nQtObject{\nproperty int test: 13}", 0) == null); - notReady = (createQmlObject("import Qt 4.6\nQtObject{\nBlah{}\n}", root, "http://www.example.com/main.qml") == null); + notAvailable = (createQmlObject("import Qt 4.6\nQtObject{Blah{}}", root) == null); runtimeError = (createQmlObject("import Qt 4.6\nQtObject{property int test\nonTestChanged: QtObject{}\n}", root) == null); var o = createQmlObject("import Qt 4.6\nQtObject{\nproperty int test: 13\n}", root); diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp index debec02..4987557 100644 --- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp +++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp @@ -301,15 +301,17 @@ void tst_qdeclarativeqt::createQmlObject() QString warning1 = "QDeclarativeEngine::createQmlObject():"; QString warning2 = " " + TEST_FILE("main.qml").toString() + ":4:1: Duplicate property name"; - QString warning3 = "QDeclarativeEngine::createQmlObject(): Component is not ready"; - QString warning4 = "QDeclarativeEngine::createQmlObject():"; - QString warning5 = " " + TEST_FILE("inline").toString() + ":3: Cannot assign object type QObject with no default method"; + QString warning3 = "QDeclarativeEngine::createQmlObject():"; + QString warning4 = " " + TEST_FILE("inline").toString() + ":2:10: Blah is not a type"; + QString warning5 = "QDeclarativeEngine::createQmlObject():"; + QString warning6 = " " + TEST_FILE("inline").toString() + ":3: Cannot assign object type QObject with no default method"; QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning3)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning4)); QTest::ignoreMessage(QtWarningMsg, qPrintable(warning5)); + QTest::ignoreMessage(QtWarningMsg, qPrintable(warning6)); QObject *object = component.create(); QVERIFY(object != 0); @@ -319,7 +321,7 @@ void tst_qdeclarativeqt::createQmlObject() QCOMPARE(object->property("emptyArg").toBool(), true); QCOMPARE(object->property("errors").toBool(), true); QCOMPARE(object->property("noParent").toBool(), true); - QCOMPARE(object->property("notReady").toBool(), true); + QCOMPARE(object->property("notAvailable").toBool(), true); QCOMPARE(object->property("runtimeError").toBool(), true); QCOMPARE(object->property("success").toBool(), true); |