summaryrefslogtreecommitdiff
path: root/doc/src/declarative/network.qdoc
diff options
context:
space:
mode:
authorEckhart Koppen <eckhart.koppen@nokia.com>2011-04-05 12:05:24 +0300
committerEckhart Koppen <eckhart.koppen@nokia.com>2011-04-05 12:05:24 +0300
commitc20dbae2860d1ec681be50f161792c6aede08b1b (patch)
treead0082d3fb710ffd20d4c1745f312c1a702b5a16 /doc/src/declarative/network.qdoc
parent9c365ff16abec339c3930444dc1722a419f07dad (diff)
parentc3e903409b96fede96cb4a7b95ba308663c88879 (diff)
downloadqt4-tools-c20dbae2860d1ec681be50f161792c6aede08b1b.tar.gz
Merge remote-tracking branch 'qt-master/master'
Conflicts: src/s60installs/bwins/QtOpenVGu.def
Diffstat (limited to 'doc/src/declarative/network.qdoc')
-rw-r--r--doc/src/declarative/network.qdoc6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/src/declarative/network.qdoc b/doc/src/declarative/network.qdoc
index 675a0aaef7..1b2934a41c 100644
--- a/doc/src/declarative/network.qdoc
+++ b/doc/src/declarative/network.qdoc
@@ -27,6 +27,10 @@
/*!
\page qdeclarativenetwork.html
+\ingroup qml-features
+\previouspage {Dynamic Object Management in QML}{Dynamic Object Management}
+\nextpage {QML Internationalization}{Internationalization}
+\contentspage QML Features
\title Network Transparency
QML supports network transparency by using URLs (rather than file names) for all
@@ -57,7 +61,7 @@ Network transparency is supported throughout QML, for example:
Even QML types themselves can be on the network - if the \l {QML Viewer} is used to load
\tt http://example.com/mystuff/Hello.qml and that content refers to a type "World", the engine
will load \tt http://example.com/mystuff/qmldir and resolve the type just as it would for a local file.
-For example if the qmldir file contains the line "World World.qml", it will load
+For example if the qmldir file contains the line "World World.qml", it will load
\tt http://example.com/mystuff/World.qml
Any other resources that \tt Hello.qml referred to, usually by a relative URL, would
similarly be loaded from the network.