diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-19 03:34:28 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-19 03:34:28 (GMT) |
commit | a9a2b17b8a967c001137e12af570856d9ce4b937 (patch) | |
tree | acef06e5d0bc9c994289531925c5a442767230da /tests/auto/declarative/qmlcontext | |
parent | 0b991014c55d02211eee01cad44b4ca4a2edb07d (diff) | |
download | Qt-a9a2b17b8a967c001137e12af570856d9ce4b937.zip Qt-a9a2b17b8a967c001137e12af570856d9ce4b937.tar.gz Qt-a9a2b17b8a967c001137e12af570856d9ce4b937.tar.bz2 |
Rename QML Object to QtObject
Diffstat (limited to 'tests/auto/declarative/qmlcontext')
-rw-r--r-- | tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp b/tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp index 3c60b2b..f82f202 100644 --- a/tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp +++ b/tests/auto/declarative/qmlcontext/tst_qmlcontext.cpp @@ -244,7 +244,7 @@ private: #define TEST_CONTEXT_PROPERTY(ctxt, name, value) \ { \ QmlComponent component(&engine); \ - component.setData("import Qt 4.6; Object { property var test: " #name " }", QUrl()); \ + component.setData("import Qt 4.6; QtObject { property var test: " #name " }", QUrl()); \ \ QObject *obj = component.create(ctxt); \ \ @@ -294,7 +294,7 @@ void tst_qmlcontext::setContextProperty() // Changes in context properties { QmlComponent component(&engine); - component.setData("import Qt 4.6; Object { property var test: a }", QUrl()); + component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); QObject *obj = component.create(&ctxt2); @@ -306,7 +306,7 @@ void tst_qmlcontext::setContextProperty() } { QmlComponent component(&engine); - component.setData("import Qt 4.6; Object { property var test: b }", QUrl()); + component.setData("import Qt 4.6; QtObject { property var test: b }", QUrl()); QObject *obj = component.create(&ctxt2); @@ -320,7 +320,7 @@ void tst_qmlcontext::setContextProperty() } { QmlComponent component(&engine); - component.setData("import Qt 4.6; Object { property var test: e.a }", QUrl()); + component.setData("import Qt 4.6; QtObject { property var test: e.a }", QUrl()); QObject *obj = component.create(&ctxt2); @@ -334,7 +334,7 @@ void tst_qmlcontext::setContextProperty() // New context properties { QmlComponent component(&engine); - component.setData("import Qt 4.6; Object { property var test: a }", QUrl()); + component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); QObject *obj = component.create(&ctxt2); @@ -348,7 +348,7 @@ void tst_qmlcontext::setContextProperty() // Setting an object-variant context property { QmlComponent component(&engine); - component.setData("import Qt 4.6; Object { id: root; property int a: 10; property int test: ctxtProp.a; property var obj: root; }", QUrl()); + component.setData("import Qt 4.6; QtObject { id: root; property int a: 10; property int test: ctxtProp.a; property var obj: root; }", QUrl()); QmlContext ctxt(engine.rootContext()); ctxt.setContextProperty("ctxtProp", QVariant()); @@ -400,7 +400,7 @@ void tst_qmlcontext::addDefaultObject() // Changes in context properties { QmlComponent component(&engine); - component.setData("import Qt 4.6; Object { property var test: a }", QUrl()); + component.setData("import Qt 4.6; QtObject { property var test: a }", QUrl()); QObject *obj = component.create(&ctxt); |