diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-08-09 08:43:50 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-08-09 08:43:50 (GMT) |
| commit | 3e58be3eefbb63c1acf7ecfd1fbbefdf324597ad (patch) | |
| tree | a8684303c39ed573e759e1909cbf86ce319ed95c /doc | |
| parent | 94244ea3c5edf57d4dc258381d37bc99fc23ed0d (diff) | |
| parent | ac355872573c7131e4b783cabe00c5656dc668af (diff) | |
| download | Qt-3e58be3eefbb63c1acf7ecfd1fbbefdf324597ad.zip Qt-3e58be3eefbb63c1acf7ecfd1fbbefdf324597ad.tar.gz Qt-3e58be3eefbb63c1acf7ecfd1fbbefdf324597ad.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/declarativeui.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc index 1fc9d69..b25d000 100644 --- a/doc/src/declarative/declarativeui.qdoc +++ b/doc/src/declarative/declarativeui.qdoc @@ -43,7 +43,7 @@ C++ module, you can load and interact with QML files from your Qt application. QML provides mechanisms to declaratively build an object tree using \l {QML Elements}{QML elements}. QML improves the integration between -{http://www.ecma-international.org/publications/standards/Ecma-262.htm}{JavaScript} +\l {http://www.ecma-international.org/publications/standards/Ecma-262.htm}{JavaScript} and Qt's existing QObject based type system, adds support for automatic \l {Property Binding}{property bindings} and provides \l {Network Transparency}{network transparency} |