diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-03-18 01:10:05 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-03-18 01:10:05 (GMT) |
| commit | 19988e1a2b81ae4a54edb6fec1f489326ae39089 (patch) | |
| tree | 2b993201c0e91ea4c037ac879c1558a3bc25b04e /tests/auto/declarative/qdeclarativeitem | |
| parent | 4b4e9be3ea5a267c8fc05d6ff5aca972d64eb705 (diff) | |
| download | Qt-19988e1a2b81ae4a54edb6fec1f489326ae39089.zip Qt-19988e1a2b81ae4a54edb6fec1f489326ae39089.tar.gz Qt-19988e1a2b81ae4a54edb6fec1f489326ae39089.tar.bz2 | |
Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04.
The import order has changed, so test files that mirror element names
needed to be renamed (or they would resolve as the type).
Diffstat (limited to 'tests/auto/declarative/qdeclarativeitem')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeitem/data/keynavigationtest.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/keynavigation.qml) | 0 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeitem/data/keystest.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/keys.qml) | 0 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp | 4 |
3 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativeitem/data/keynavigation.qml b/tests/auto/declarative/qdeclarativeitem/data/keynavigationtest.qml index 08da901..08da901 100644 --- a/tests/auto/declarative/qdeclarativeitem/data/keynavigation.qml +++ b/tests/auto/declarative/qdeclarativeitem/data/keynavigationtest.qml diff --git a/tests/auto/declarative/qdeclarativeitem/data/keys.qml b/tests/auto/declarative/qdeclarativeitem/data/keystest.qml index 7d34fc8..7d34fc8 100644 --- a/tests/auto/declarative/qdeclarativeitem/data/keys.qml +++ b/tests/auto/declarative/qdeclarativeitem/data/keystest.qml diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp index 45d670f..ba69cd8 100644 --- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp +++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp @@ -120,7 +120,7 @@ void tst_QDeclarativeItem::keys() canvas->rootContext()->setContextProperty("enableKeyHanding", QVariant(true)); - canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/keys.qml")); + canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/keystest.qml")); canvas->show(); qApp->processEvents(); @@ -215,7 +215,7 @@ void tst_QDeclarativeItem::keyNavigation() QDeclarativeView *canvas = new QDeclarativeView(0); canvas->setFixedSize(240,320); - canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/keynavigation.qml")); + canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/keynavigationtest.qml")); canvas->show(); qApp->processEvents(); |