summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-04-22 03:07:09 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-04-22 03:07:53 (GMT)
commite6b5d2a4df73aa26812e26daa3199443bd84cc90 (patch)
tree1c6683e6f4ef92fc8e13f99d3c3045f0833faa82 /doc
parent9a40a3e76171c06d32ab4cadf700f6504dada129 (diff)
downloadQt-e6b5d2a4df73aa26812e26daa3199443bd84cc90.zip
Qt-e6b5d2a4df73aa26812e26daa3199443bd84cc90.tar.gz
Qt-e6b5d2a4df73aa26812e26daa3199443bd84cc90.tar.bz2
Autotests and doc
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/globalobject.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index d729d4f..6709ab4 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -190,10 +190,10 @@ This function attempts to open the specified \c target url in an external applic
This function returns a hex string of the md5 hash of \c data.
\section3 Qt.btoa(data)
-This function returns a base64 encoding of \c data.
+Binary to ASCII - this function returns a base64 encoding of \c data.
\section3 Qt.atob(data)
-This function returns a base64 decoding of \c data.
+ASCII to binary - this function returns a base64 decoding of \c data.
\section3 Qt.quit()
This function causes the QML engine to emit the quit signal, which in