diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-07 12:31:14 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-07 12:31:14 (GMT) |
| commit | 30cf45cf53e030158fef4dfb262e7444332d3138 (patch) | |
| tree | 3bfe9133feb8d1505b6e394e791a348cdf4d475f /doc/src/qt4-intro.qdoc | |
| parent | d52f0887a740d147a74c3e38ae587f688fbf896a (diff) | |
| parent | 3505c6cdcdfac5a6d0f4b94dbdbcc8ad72f8048a (diff) | |
| download | Qt-30cf45cf53e030158fef4dfb262e7444332d3138.zip Qt-30cf45cf53e030158fef4dfb262e7444332d3138.tar.gz Qt-30cf45cf53e030158fef4dfb262e7444332d3138.tar.bz2 | |
Merge branch '4.7-oslo1' into 4.7-doc
Diffstat (limited to 'doc/src/qt4-intro.qdoc')
| -rw-r--r-- | doc/src/qt4-intro.qdoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc index a88b326..8684ad2 100644 --- a/doc/src/qt4-intro.qdoc +++ b/doc/src/qt4-intro.qdoc @@ -475,7 +475,8 @@ \i Qt Creator has been improved to support interactive editing of QML UIs through drag-and-drop. The text editor supports the QML syntax and provides authoring assistance such as auto-completion, - error lookup, help lookup and easy preview of QML UI's. + error lookup, help lookup and easy preview of QML UI's. The Qt + Quick features in Qt Creator will be released with Qt Creator 2.1 \endlist \section1 Network Bearer Management |