diff options
author | Martin Jones <martin.jones@nokia.com> | 2011-07-11 13:47:51 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-12 06:38:09 +0200 |
commit | 4442dea01b9d4d45964228ac442166d89f091f9e (patch) | |
tree | 28ae20cb26967765a988b1ee522fc2d64d777671 /tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp | |
parent | b119220da60453ecf31898f7a57eda9d3c4e9225 (diff) |
Extract all QtQuick 1 elements into a separate library/plugin.
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2
Reviewed-on: http://codereview.qt.nokia.com/1391
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp')
-rw-r--r-- | tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp index f0edf40b87..37cce5c578 100644 --- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp +++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp @@ -42,7 +42,7 @@ #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativeconnections_p.h> -#include <private/qdeclarativeitem_p.h> +#include <private/qsgitem_p.h> #include "../../../shared/util.h" #include <QtDeclarative/qdeclarativescriptstring.h> @@ -107,7 +107,7 @@ void tst_qdeclarativeconnection::connection() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/test-connection.qml")); - QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create()); + QSGItem *item = qobject_cast<QSGItem*>(c.create()); QVERIFY(item != 0); @@ -124,7 +124,7 @@ void tst_qdeclarativeconnection::trimming() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/trimming.qml")); - QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create()); + QSGItem *item = qobject_cast<QSGItem*>(c.create()); QVERIFY(item != 0); @@ -145,18 +145,18 @@ void tst_qdeclarativeconnection::targetChanged() { QDeclarativeEngine engine; QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/connection-targetchange.qml")); - QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create()); + QSGItem *item = qobject_cast<QSGItem*>(c.create()); QVERIFY(item != 0); QDeclarativeConnections *connections = item->findChild<QDeclarativeConnections*>("connections"); QVERIFY(connections); - QDeclarativeItem *item1 = item->findChild<QDeclarativeItem*>("item1"); + QSGItem *item1 = item->findChild<QSGItem*>("item1"); QVERIFY(item1); item1->setWidth(200); - QDeclarativeItem *item2 = item->findChild<QDeclarativeItem*>("item2"); + QSGItem *item2 = item->findChild<QSGItem*>("item2"); QVERIFY(item2); QVERIFY(connections->target() == item2); @@ -190,7 +190,7 @@ void tst_qdeclarativeconnection::unknownSignals() QDeclarativeEngine engine; QDeclarativeComponent c(&engine, url); - QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(c.create()); + QSGItem *item = qobject_cast<QSGItem*>(c.create()); QVERIFY(item != 0); // check that connection is created (they are all runtime errors) |