summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2010-04-20 06:39:38 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2010-04-20 06:39:38 (GMT)
commit7d196d3558321623de2de0b6c145239dd475b749 (patch)
tree1b33b44511cb1cb2e7de42e8978ada4c44c9d3a3 /doc
parentb0fd95e035888bbfc474814bc6796a4acbf6e958 (diff)
downloadQt-7d196d3558321623de2de0b6c145239dd475b749.zip
Qt-7d196d3558321623de2de0b6c145239dd475b749.tar.gz
Qt-7d196d3558321623de2de0b6c145239dd475b749.tar.bz2
doc
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/globalobject.qdoc2
-rw-r--r--doc/src/declarative/qdeclarativesecurity.qdoc4
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index c41c344..d84754b 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -288,6 +288,8 @@ of their use.
\section1 XMLHttpRequest
+\target XMLHttpRequest
+
QML script supports the XMLHttpRequest object, which can be used to asynchronously obtain
data from over a network.
diff --git a/doc/src/declarative/qdeclarativesecurity.qdoc b/doc/src/declarative/qdeclarativesecurity.qdoc
index 290d78f..91d6d87 100644
--- a/doc/src/declarative/qdeclarativesecurity.qdoc
+++ b/doc/src/declarative/qdeclarativesecurity.qdoc
@@ -72,7 +72,7 @@ A non-exhaustive list of the ways you could shoot yourself in the foot is:
\list
\i Using \c import to import QML or JavaScript you do not control. BAD
\i Using \l Loader to import QML you do not control. BAD
- \i Using \l{XMLHttpRequest()}{XMLHttpRequest} to load data you do not control and executing it. BAD
+ \i Using \l{XMLHttpRequest}{XMLHttpRequest} to load data you do not control and executing it. BAD
\endlist
However, the above does not mean that you have no use for the network transparency of QML.
@@ -81,7 +81,7 @@ There are many good and useful things you \e can do:
\list
\i Create \l Image elements with source URLs of any online images. GOOD
\i Use XmlListModel to present online content. GOOD
- \i Use \l{XMLHttpRequest()}{XMLHttpRequest} to interact with online services. GOOD
+ \i Use \l{XMLHttpRequest}{XMLHttpRequest} to interact with online services. GOOD
\endlist
The only reason this page is necessary at all is that JavaScript, when run in a \e{web browser},