diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-08 04:11:32 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-08 04:11:32 (GMT) |
| commit | 1ab17b479a41559c74c86916492bb812c0b9e74e (patch) | |
| tree | beec43e38ddb057b7623a12b60d12acedace643b /tests/auto/declarative/qmlgraphicsgridview | |
| parent | 5c238b1260f589a906aae3f20d9b412ed2f76a65 (diff) | |
| parent | 87d71b29a8c4239cb807f13ac9d009cef1ca1a69 (diff) | |
| download | Qt-1ab17b479a41559c74c86916492bb812c0b9e74e.zip Qt-1ab17b479a41559c74c86916492bb812c0b9e74e.tar.gz Qt-1ab17b479a41559c74c86916492bb812c0b9e74e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'tests/auto/declarative/qmlgraphicsgridview')
| -rw-r--r-- | tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp b/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp index 9d79407..c157e62 100644 --- a/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp +++ b/tests/auto/declarative/qmlgraphicsgridview/tst_qmlgraphicsgridview.cpp @@ -769,7 +769,7 @@ void tst_QmlGraphicsGridView::changeFlow() void tst_QmlGraphicsGridView::defaultValues() { QmlEngine engine; - QmlComponent c(&engine, QUrl("file://" SRCDIR "/data/gridview3.qml")); + QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/gridview3.qml")); QmlGraphicsGridView *obj = qobject_cast<QmlGraphicsGridView*>(c.create()); QVERIFY(obj != 0); @@ -792,7 +792,7 @@ void tst_QmlGraphicsGridView::defaultValues() void tst_QmlGraphicsGridView::properties() { QmlEngine engine; - QmlComponent c(&engine, QUrl("file://" SRCDIR "/data/gridview2.qml")); + QmlComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/gridview2.qml")); QmlGraphicsGridView *obj = qobject_cast<QmlGraphicsGridView*>(c.create()); QVERIFY(obj != 0); |