diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2013-04-22 19:49:30 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-24 14:18:12 +0200 |
| commit | 9baaeba10184c908267e1332d6ec4329d6a71fd3 (patch) | |
| tree | 188a5f00ff5b79f51afaa29468539dd1b70a8e7b /src/quick/doc | |
| parent | b1a321a1d7762e8c20e244164bd42822c3bd0310 (diff) | |
Doc: Un-overload the word "module"
"The Qt Quick module contains the QtQuick QML module and the Qt Quick
C++ module" is an odd way to describe things.
The concept of a "QML module" is deeply entrenched so this patch won't
touch it, but at least we can get rid of references to "C++ module"s.
Change-Id: Ib06f8e3152551901dc6016cb37507cb9608d7863
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/quick/doc')
| -rw-r--r-- | src/quick/doc/src/qtquick.qdoc | 8 | ||||
| -rw-r--r-- | src/quick/doc/src/whatsnew.qdoc | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc index c570da531c..9fba663a1c 100644 --- a/src/quick/doc/src/qtquick.qdoc +++ b/src/quick/doc/src/qtquick.qdoc @@ -38,11 +38,9 @@ provides a visual canvas and includes types for creating and animating visual components, receiving user input, creating data models and views and delayed object instantiation. -The Qt Quick module provides both the \c QtQuick QML module, which supplies -\l{Qt Quick QML Types}{a set of QML types} for creating user -interfaces with the QML language, and the \c QtQuick C++ module, which supplies -\l{Qt Quick C++ Classes}{a set of C++ APIs} for integrating with user interfaces and -applications built with QML and the \c QtQuick QML module. +The Qt Quick module provides both a \l{Qt Quick QML Types}{QML API} which supplies +QML types for creating user interfaces with the QML language, and a +\l{Qt Quick C++ Classes}{C++ API} for extending QML applications with C++ code. \note From Qt 5.1, a set of Qt Quick based UI controls is available to create classic desktop-style user interfaces. Please see \l{Qt Quick Controls} diff --git a/src/quick/doc/src/whatsnew.qdoc b/src/quick/doc/src/whatsnew.qdoc index 174fa2219c..baa0312aa4 100644 --- a/src/quick/doc/src/whatsnew.qdoc +++ b/src/quick/doc/src/whatsnew.qdoc @@ -29,9 +29,9 @@ \title Qt Quick Release Notes \page qtquick-releasenotes.html -\section1 Qt 5.0 - Qt Quick C++ Module +\section1 Qt Quick in Qt 5 -The \l {Qt Quick} C++ module is new in Qt 5. It provides the visual canvas and scenegraph back-end +The \l {Qt Quick} module is new in Qt 5. It provides the visual canvas and scenegraph back-end as well as the \c QtQuick QML module for QML application development. As of Qt 5, the \l {Qt Quick} module is based on an OpenGL scenegraph. Many of the classes in |