From c2e8af87b10eaf57d397d467a79fcc24fa23bacf Mon Sep 17 00:00:00 2001 From: Keith Isdale Date: Thu, 18 Aug 2011 14:25:27 +1000 Subject: Improve documentation for QDeclarativeView::setSource() Add reference to tutorial on setting source file for QDeclarativeView. Make use of compiled example code that demonstrate using Qt Resources in calls to QDeclarativeView::setSource() . Task-number: QTBUG-20985 Reviewed-by: Alan Alpert --- doc/src/declarative/network.qdoc | 7 +++---- src/declarative/util/qdeclarativeview.cpp | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/src/declarative/network.qdoc b/doc/src/declarative/network.qdoc index cb83542..0ebf8ae 100644 --- a/doc/src/declarative/network.qdoc +++ b/doc/src/declarative/network.qdoc @@ -134,10 +134,9 @@ One of the URL schemes built into Qt is the "qrc" scheme. This allows content to the executable using \l{The Qt Resource System}. Using this, an executable can reference QML content that is compiled into the executable: -\code - QDeclarativeView *canvas = new QDeclarativeView; - canvas->setUrl(QUrl("qrc:/dial.qml")); -\endcode +\quotefromfile snippets/declarative/qtbinding/resources/main.cpp +\skipto view +\printuntil setSource The content itself can then use relative URLs, and so be transparently unaware that the content is compiled into the executable. diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp index bab991b..45995ce 100644 --- a/src/declarative/util/qdeclarativeview.cpp +++ b/src/declarative/util/qdeclarativeview.cpp @@ -319,6 +319,8 @@ QDeclarativeView::~QDeclarativeView() Ensure that the URL provided is full and correct, in particular, use \l QUrl::fromLocalFile() when loading a file from the local filesystem. + + \sa {Network Transparency}{Loading Resources in QML} */ /*! -- cgit v0.12