diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-11-16 03:50:29 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-11-16 03:50:29 (GMT) |
| commit | 86f89023b52e00d155d6b14762f1a99a70d67e60 (patch) | |
| tree | 9693d5a3dd848efe61bd2d1574453b63d279f7ab /doc/src/declarative | |
| parent | efb25bac3131b4ca39a44a16526d88c814986d60 (diff) | |
| parent | 66eb8e1a135f5ac54be2ea088bae9c82708c4258 (diff) | |
| download | Qt-86f89023b52e00d155d6b14762f1a99a70d67e60.zip Qt-86f89023b52e00d155d6b14762f1a99a70d67e60.tar.gz Qt-86f89023b52e00d155d6b14762f1a99a70d67e60.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src/declarative')
| -rw-r--r-- | doc/src/declarative/globalobject.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/declarative/network.qdoc | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc index a39d858..3cf1ca3 100644 --- a/doc/src/declarative/globalobject.qdoc +++ b/doc/src/declarative/globalobject.qdoc @@ -123,6 +123,11 @@ This function plays the audio file located at \c soundLocation. Only .wav files \section3 Qt.openUrlExternally(url target) This function attempts to open the specified \c target url in an external application, based on the user's desktop preferences. It will return true if it succeeds, and false otherwise. +\section3 Qt.md5(data) +This function returns a hex string of the md5 hash of \c data. + +\endlist + \section1 Dynamic Object Creation The following functions on the global object allow you to dynamically create QML items from files or strings. diff --git a/doc/src/declarative/network.qdoc b/doc/src/declarative/network.qdoc index a81eb0f..4ed5ca2 100644 --- a/doc/src/declarative/network.qdoc +++ b/doc/src/declarative/network.qdoc @@ -91,8 +91,8 @@ Image { \endqml The \l Image source property will be assigned \tt{http://example.com/mystuff/images/logo.png}, -but while the QML is being developed, in say \tt C:\User\Fred\Documents\MyStuff\test.qml, it will be assigned -\tt C:\User\Fred\Documents\MyStuff\images\logo.png. +but while the QML is being developed, in say \tt C:\\User\\Fred\\Documents\\MyStuff\\test.qml, it will be assigned +\tt C:\\User\\Fred\\Documents\\MyStuff\\images\\logo.png. If the string assigned to a URL is already an absolute URL, then "resolving" does not change it and the URL is assigned directly. |