diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:30:12 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:30:12 +0100 |
| commit | 11484c7f64b5942994a1d1a07f4e7f4d86e94e83 (patch) | |
| tree | f0c901d1d15d0bcb8ce572a04b094e510cd86ddd /src/qml | |
| parent | a1a7679028eda395d74cd1247a8c3ed46ac3bef1 (diff) | |
| parent | b58953fae3dc80c52e846d2d87856dd20b8986ab (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro
Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/doc/src/whatsnew.qdoc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/qml/doc/src/whatsnew.qdoc b/src/qml/doc/src/whatsnew.qdoc index e6c02c06e9..361f6e61ee 100644 --- a/src/qml/doc/src/whatsnew.qdoc +++ b/src/qml/doc/src/whatsnew.qdoc @@ -30,10 +30,10 @@ \page qtqml-releasenotes.html \inqmlmodule QtQuick 2.0 -\section1 Qt 5.0 +\section1 Qt QML in Qt 5 -The QtQml C++ module is new in Qt 5. It provides the QML engine and implements -the QML language supporting infrastructure. +The \l{Qt QML} module is new in Qt 5.0. It provides the QML engine and +implements the QML language supporting infrastructure. (Prior to Qt 5, this functionality was provided by the QtDeclarative module, which has now been replaced by the new QtQml and QtQuick C++ modules. See the @@ -100,4 +100,3 @@ has now been replaced by the new QtQml and QtQuick C++ modules. See the \endlist */ - |