diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-26 10:26:57 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-01-26 10:26:57 (GMT) |
| commit | 39e7c4de155a150a0e7da6e40f59aadecaea0a8a (patch) | |
| tree | 42e98a13192f001365aead8c69000db8ee90979a /doc/src/declarative | |
| parent | 9657c4fa2040758b8aa3a5f7f7c81442cbaba621 (diff) | |
| parent | a0177c4b9e4566f9d9edcab7b12ed77bfd823590 (diff) | |
| download | Qt-39e7c4de155a150a0e7da6e40f59aadecaea0a8a.zip Qt-39e7c4de155a150a0e7da6e40f59aadecaea0a8a.tar.gz Qt-39e7c4de155a150a0e7da6e40f59aadecaea0a8a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Fixing a merge conflict.
Conflicts:
doc/src/overviews.qdoc
Diffstat (limited to 'doc/src/declarative')
| -rw-r--r-- | doc/src/declarative/globalobject.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/declarative/qtprogrammers.qdoc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc index 8671b48..2568f81 100644 --- a/doc/src/declarative/globalobject.qdoc +++ b/doc/src/declarative/globalobject.qdoc @@ -48,7 +48,7 @@ data from over a network. The XMLHttpRequest API implements the same \l {http://www.w3.org/TR/XMLHttpRequest/}{W3C standard} as many popular web browsers with following exceptions: \list -\i QML's XMLHttpRequest does not enforce the same origin policty. +\i QML's XMLHttpRequest does not enforce the same origin policy. \i QML's XMLHttpRequest does not support \e synchronous requests. \endlist @@ -77,7 +77,7 @@ browser. The following objects and properties are supported by the QML implemen \o lastChild \o previousSibling \o nextSibling -\o attribtes +\o attributes \endlist \o diff --git a/doc/src/declarative/qtprogrammers.qdoc b/doc/src/declarative/qtprogrammers.qdoc index a31f32a..97caf80 100644 --- a/doc/src/declarative/qtprogrammers.qdoc +++ b/doc/src/declarative/qtprogrammers.qdoc @@ -104,7 +104,7 @@ So, to implement your reusable button, you would simply build a QML component. Parent widgets each provide a generic way to interface to one or more arbitrary other widgets. A QTabWidget provides an interface to multiple "pages", one of which is visible at any time, -and a mechanism for selecting among them (the QTabBar). A QScollArea provides scrollbars around +and a mechanism for selecting among them (the QTabBar). A QScrollArea provides scrollbars around a widget that is otherwise too large to fit in available space. Nearly all such components can be created directly in QML. Only a few cases |