aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
diff options
context:
space:
mode:
authorMatthew Vogt <matthew.vogt@nokia.com>2012-01-31 16:52:36 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-03 00:39:18 +0100
commit01dc7e2ea476e0e6dcdce2e72979bbc858f4057d (patch)
treed8796f7695bbf8ad42abf47cd84c1b5e000ef795 /tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
parent5e07b57b818326da47a46d384415041fa4cea0ba (diff)
Remove QtQuick1 elements from qtdeclarative
QtQuick1 is now contained in a separate repository. Task-number: QTBUG-23737 Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp')
-rw-r--r--tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
index edb025ed49..05db898045 100644
--- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
+++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
@@ -236,7 +236,7 @@ private:
#define TEST_CONTEXT_PROPERTY(ctxt, name, value) \
{ \
QDeclarativeComponent component(&engine); \
- component.setData("import QtQuick 1.0; QtObject { property variant test: " #name " }", QUrl()); \
+ component.setData("import QtQuick 2.0; QtObject { property variant test: " #name " }", QUrl()); \
\
QObject *obj = component.create(ctxt); \
\
@@ -286,7 +286,7 @@ void tst_qdeclarativecontext::setContextProperty()
// Changes in context properties
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { property variant test: a }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { property variant test: a }", QUrl());
QObject *obj = component.create(&ctxt2);
@@ -298,7 +298,7 @@ void tst_qdeclarativecontext::setContextProperty()
}
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { property variant test: b }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { property variant test: b }", QUrl());
QObject *obj = component.create(&ctxt2);
@@ -312,7 +312,7 @@ void tst_qdeclarativecontext::setContextProperty()
}
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { property variant test: e.a }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { property variant test: e.a }", QUrl());
QObject *obj = component.create(&ctxt2);
@@ -326,7 +326,7 @@ void tst_qdeclarativecontext::setContextProperty()
// New context properties
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { property variant test: a }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { property variant test: a }", QUrl());
QObject *obj = component.create(&ctxt2);
@@ -340,7 +340,7 @@ void tst_qdeclarativecontext::setContextProperty()
// Setting an object-variant context property
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { id: root; property int a: 10; property int test: ctxtProp.a; property variant obj: root; }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { id: root; property int a: 10; property int test: ctxtProp.a; property variant obj: root; }", QUrl());
QDeclarativeContext ctxt(engine.rootContext());
ctxt.setContextProperty("ctxtProp", QVariant());
@@ -388,7 +388,7 @@ void tst_qdeclarativecontext::setContextObject()
// Changes in context properties
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { property variant test: a }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { property variant test: a }", QUrl());
QObject *obj = component.create(&ctxt);
@@ -420,7 +420,7 @@ void tst_qdeclarativecontext::destruction()
void tst_qdeclarativecontext::idAsContextProperty()
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { property variant a; a: QtObject { id: myObject } }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { property variant a; a: QtObject { id: myObject } }", QUrl());
QObject *obj = component.create();
QVERIFY(obj);
@@ -440,7 +440,7 @@ void tst_qdeclarativecontext::idAsContextProperty()
void tst_qdeclarativecontext::readOnlyContexts()
{
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { id: me }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { id: me }", QUrl());
QObject *obj = component.create();
QVERIFY(obj);
@@ -485,7 +485,7 @@ void tst_qdeclarativecontext::nameForObject()
// As an id
QDeclarativeComponent component(&engine);
- component.setData("import QtQuick 1.0; QtObject { id: root; property QtObject o: QtObject { id: nested } }", QUrl());
+ component.setData("import QtQuick 2.0; QtObject { id: root; property QtObject o: QtObject { id: nested } }", QUrl());
QObject *o = component.create();
QVERIFY(o != 0);