summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-30 07:24:07 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-30 07:24:07 (GMT)
commit89f21d7269ae7bf29e718958d00da84e5c60257f (patch)
treedc78b51060cb34430177a7a1912d0ebbd674795d /doc/src
parent3011031d0d95d47e7597a81ecbf47004664c4ed9 (diff)
parentd8683cd18c852569672e43237c06dc619f193eba (diff)
downloadQt-89f21d7269ae7bf29e718958d00da84e5c60257f.zip
Qt-89f21d7269ae7bf29e718958d00da84e5c60257f.tar.gz
Qt-89f21d7269ae7bf29e718958d00da84e5c60257f.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/globalobject.qdoc3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index 47460cf..7c27ae4 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -226,6 +226,9 @@ This function causes the QML engine to emit the quit signal, which in
This function returns \c url resolved relative to the URL of the
caller.
+\section3 Qt.fontFamilies()
+This function returns a list of the font families available to the application.
+
\section3 Qt.isQtObject(object)
Returns true if \c object is a valid reference to a Qt or QML object, otherwise false.