diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-13 03:24:43 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-13 03:24:43 (GMT) |
| commit | ffdb6fcca3bf8f4cc97f8bfe09a43811c29a7dbe (patch) | |
| tree | b0865c2107f0794feda8bdfc96d2e6447d6b045e /tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp | |
| parent | 6c19bdb8552f3cc6ced2a20868f1f1952f94a69c (diff) | |
| parent | 50711dd7aa22052eff58431d9f4e95e1a688047e (diff) | |
| download | Qt-ffdb6fcca3bf8f4cc97f8bfe09a43811c29a7dbe.zip Qt-ffdb6fcca3bf8f4cc97f8bfe09a43811c29a7dbe.tar.gz Qt-ffdb6fcca3bf8f4cc97f8bfe09a43811c29a7dbe.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp')
| -rw-r--r-- | tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp b/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp index 2207635..c0c5abc 100644 --- a/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp +++ b/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp @@ -75,7 +75,7 @@ void tst_qdeclarativelayoutitem::test_resizing() view.setScene(&scene); //Add the QML snippet into the layout QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl(SRCDIR "/data/layoutItem.qml")); + QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/layoutItem.qml")); QDeclarativeLayoutItem* obj = static_cast<QDeclarativeLayoutItem*>(c.create()); layout->addItem(obj); layout->setContentsMargins(0,0,0,0); |