diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-31 11:54:04 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-31 11:54:04 (GMT) |
| commit | 9f51c31a0f492c20e6d882b2ae1e036b29c2755c (patch) | |
| tree | cbb3beed71735514632b4f2788b63e72667cfc04 /doc/src/declarative | |
| parent | 0e10b8dbb7d84694cbdeb57bf42df52b12d79f47 (diff) | |
| parent | 4f933036a0ecbc6e6174b312ec2fd6078cea5b70 (diff) | |
| download | Qt-9f51c31a0f492c20e6d882b2ae1e036b29c2755c.zip Qt-9f51c31a0f492c20e6d882b2ae1e036b29c2755c.tar.gz Qt-9f51c31a0f492c20e6d882b2ae1e036b29c2755c.tar.bz2 | |
Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7
Conflicts:
src/network/ssl/qsslcertificate.cpp
Diffstat (limited to 'doc/src/declarative')
| -rw-r--r-- | doc/src/declarative/network.qdoc | 7 |
1 files changed, 3 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. |