diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-22 03:18:13 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-22 03:18:13 (GMT) |
| commit | fb94bfda66ac8767c96cb521a1f77c6b8be5bb95 (patch) | |
| tree | b4fdd4165ff33ed78d9485c089afb2e11b526e18 /doc/src | |
| parent | 6b03492619243a1ede75ba324b8422304c662231 (diff) | |
| parent | e6b5d2a4df73aa26812e26daa3199443bd84cc90 (diff) | |
| download | Qt-fb94bfda66ac8767c96cb521a1f77c6b8be5bb95.zip Qt-fb94bfda66ac8767c96cb521a1f77c6b8be5bb95.tar.gz Qt-fb94bfda66ac8767c96cb521a1f77c6b8be5bb95.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.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/declarative/qtdeclarative.qdoc | 4 |
2 files changed, 6 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 diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc index 5d1e18f..670a218 100644 --- a/doc/src/declarative/qtdeclarative.qdoc +++ b/doc/src/declarative/qtdeclarative.qdoc @@ -91,6 +91,10 @@ qmlRegisterType<MinehuntGame>("MinehuntCore", 0, 1, "Game"); \endcode + Note that it's perfectly reasonable for a library to register types to older versions + than the actual version of the library. Indeed, it is normal for the new library to allow + QML written to previous versions to continue to work, even if more advanced versions of + some of its types are available. */ /*! |