diff options
author | Martin Smith <msmith@trolltech.com> | 2010-04-28 08:14:11 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2010-04-28 08:14:11 (GMT) |
commit | 36bd47429312f6d78d620c04bb7e62d34273d310 (patch) | |
tree | dea54adff0ec870a88d96e7e3bb00b9657175412 /doc/src/declarative/snippets/qtbinding/contextproperties/main.cpp | |
parent | 00ebbeb5c319957d5671130313da3c5485e0f31c (diff) | |
parent | 2737386ebcb99715d3198a91b5951415c24f99aa (diff) | |
download | Qt-36bd47429312f6d78d620c04bb7e62d34273d310.zip Qt-36bd47429312f6d78d620c04bb7e62d34273d310.tar.gz Qt-36bd47429312f6d78d620c04bb7e62d34273d310.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src/declarative/snippets/qtbinding/contextproperties/main.cpp')
-rw-r--r-- | doc/src/declarative/snippets/qtbinding/contextproperties/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/snippets/qtbinding/contextproperties/main.cpp b/doc/src/declarative/snippets/qtbinding/contextproperties/main.cpp index 15e3d4c..4073a6c 100644 --- a/doc/src/declarative/snippets/qtbinding/contextproperties/main.cpp +++ b/doc/src/declarative/snippets/qtbinding/contextproperties/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) context->setContextProperty("backgroundColor", QColor(Qt::yellow)); - view.setSource(QUrl("main.qml")); + view.setSource(QUrl::fromLocalFile("main.qml")); view.show(); return app.exec(); |