diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-01 00:33:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-01 00:33:27 (GMT) |
| commit | 283e899c7d57c003facc5ed8aef8e5dacf2eb945 (patch) | |
| tree | 10142cb729d010645e8326aceba0ac22f0bbf0bc /doc/src/declarative/globalobject.qdoc | |
| parent | c9bb16f0b34f180bf955682ab31fc1ff63d5de84 (diff) | |
| parent | bc1fb594d24b54b9c83994817348b0163ef1a9c5 (diff) | |
| download | Qt-283e899c7d57c003facc5ed8aef8e5dacf2eb945.zip Qt-283e899c7d57c003facc5ed8aef8e5dacf2eb945.tar.gz Qt-283e899c7d57c003facc5ed8aef8e5dacf2eb945.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix example code and image
Fix doc
Fix some bugs in the QML Web Browser buttons
Fix zoom bug in QML Web Browser demo
Fix Typo
Various doc fixes and improvements
Document issues with rectangle border width of 1 where clipping is used
Simplify selection setting. Make TextInput more like TextEdit.
Diffstat (limited to 'doc/src/declarative/globalobject.qdoc')
| -rw-r--r-- | doc/src/declarative/globalobject.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc index 7d4f9b9..3121e95 100644 --- a/doc/src/declarative/globalobject.qdoc +++ b/doc/src/declarative/globalobject.qdoc @@ -49,7 +49,7 @@ Contains all the properties of the JavaScript global object, plus: \section1 Qt Object -The \l{qml-qt.html}{Qt object} provides useful enums and functions from Qt, for use in all QML +The \l{Qt}{Qt object} provides useful enums and functions from Qt, for use in all QML files. \section1 XMLHttpRequest |