diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2009-10-16 07:31:25 (GMT) |
---|---|---|
committer | Yann Bodson <yann.bodson@nokia.com> | 2009-10-16 07:31:25 (GMT) |
commit | c48746b06e5e5e79eb6657f9acf043670306fa4e (patch) | |
tree | 683ef4d704b7401093439ff3247c0875e5911574 /doc/src | |
parent | fbd212abb05fee0ff9c9faf00c40136f0b901707 (diff) | |
parent | 9d22aa7aa14a200d8c1fc0f1b4b1ead540e45e67 (diff) | |
download | Qt-c48746b06e5e5e79eb6657f9acf043670306fa4e.zip Qt-c48746b06e5e5e79eb6657f9acf043670306fa4e.tar.gz Qt-c48746b06e5e5e79eb6657f9acf043670306fa4e.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/declarative/network.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/network.qdoc b/doc/src/declarative/network.qdoc index da4495f..e88dfdc 100644 --- a/doc/src/declarative/network.qdoc +++ b/doc/src/declarative/network.qdoc @@ -47,7 +47,7 @@ QML supports network transparency by using URLs (rather than file names) for all references from a QML document to other content. Since a \i relative URL is the same as a relative file, development of QML on regular file systems remains simple. -\section1 Accessing Network Reesources from QML +\section1 Accessing Network Resources from QML Whenever an object has a property of type URL (QUrl), assigning a string to that property will actually assign an absolute URL - by resolving the string against @@ -105,7 +105,7 @@ The \c import statement only works network transparently if it has an "as" claus All network access from QML is managed by a QNetworkAccessManager set on the QmlEngine which executes the QML. By default, this is an unmodified Qt QNetworkAccessManager. You may set a different manager using QmlEngine::setNetworkAccessManager() as appropriate for the policies of your application. -For eample, the \l qmlviewer tool sets a new QNetworkAccessManager which +For example, the \l qmlviewer tool sets a new QNetworkAccessManager which trusts HTTP Expiry headers to avoid network cache checks, allows HTTP Pipelining, adds a persistent HTTP CookieJar, a simple disk cache, and supports proxy settings. |