diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2013-04-17 23:03:16 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-23 18:29:25 +0200 |
commit | 59f075df52f5e78b95b360fb0533c2249924e7a7 (patch) | |
tree | eab4bff86cbabf6ced5beed81238c5744a53d53e /src/qml/qml | |
parent | ee2a4a90cdfc024d452ca82dfb2e1d84c050595f (diff) |
Doc: Qt Quick: Fix module name format (Pt 1/2)
Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation
Attempt to differentiate between the whole module ("Qt Quick") and the
QML import ("QtQuick") by encoding the latter with monospace font. There
are places in the text where both representations are valid.
Change-Id: Id6e157a4191aaa4e23a9cd5c76abfe902fe43d33
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/qml')
-rw-r--r-- | src/qml/qml/qqmlapplicationengine.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlparserstatus.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlapplicationengine.cpp b/src/qml/qml/qqmlapplicationengine.cpp index 7dc2c77922..a5f8f463c9 100644 --- a/src/qml/qml/qqmlapplicationengine.cpp +++ b/src/qml/qml/qqmlapplicationengine.cpp @@ -158,7 +158,7 @@ void QQmlApplicationEnginePrivate::_q_finishLoad(QObject *o) } \endcode - You can also use QCoreApplication with QQmlApplicationEngine, if you are not using any QML modules which require a QGuiApplication (such as QtQuick). + You can also use QCoreApplication with QQmlApplicationEngine, if you are not using any QML modules which require a QGuiApplication (such as \c QtQuick). List of configuration changes from a default QQmlEngine: diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 9cb444b75d..2ad887a087 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -1135,7 +1135,7 @@ static void QQmlComponent_setQmlParent(QObject *me, QObject *parent) it is not destroyed by the garbage collector. This is true regardless of whether \l{Item::parent} is set afterwards, since setting the Item parent does not change object ownership; only the graphical parent is changed. - As of QtQuick 1.1, this method accepts an optional \a properties argument that specifies a + As of \c {QtQuick 1.1}, this method accepts an optional \a properties argument that specifies a map of initial property values for the created object. These values are applied before object creation is finalized. This is more efficient than setting property values after object creation, particularly where large sets of property values are defined, and also allows property bindings diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index f128e6684a..63f579ede7 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -314,7 +314,7 @@ when the property has one of the following types: \li \c size - use \l{Qt::size()}{Qt.size()} \endlist -If the QtQuick module has been imported, the following helper functions for +If the \c QtQuick module has been imported, the following helper functions for creating objects of specific data types are also available for clients to use: \list \li \c color - use \l{Qt::rgba()}{Qt.rgba()}, \l{Qt::hsla()}{Qt.hsla()}, \l{Qt::darker()}{Qt.darker()}, \l{Qt::lighter()}{Qt.lighter()} or \l{Qt::tint()}{Qt.tint()} diff --git a/src/qml/qml/qqmlparserstatus.cpp b/src/qml/qml/qqmlparserstatus.cpp index 452a8d7eb8..4f4f2b760c 100644 --- a/src/qml/qml/qqmlparserstatus.cpp +++ b/src/qml/qml/qqmlparserstatus.cpp @@ -84,7 +84,7 @@ QT_BEGIN_NAMESPACE } \endcode - The QtQuick 1.0 version of this class is named QDeclarativeParserStatus. + The Qt Quick 1 version of this class is named QDeclarativeParserStatus. */ /*! \internal */ diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 309d896d86..4d20e3cb87 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -1634,9 +1634,9 @@ v8::Handle<v8::Value> locale(const v8::Arguments &args) \snippet qml/qtBinding.4.qml 0 - Note: in QtQuick 1.x, all function assignment was treated as + Note: in \c {QtQuick 1.x}, all function assignment was treated as binding assignment, so the Qt.binding() function is new in - QtQuick 2.0. + \c {QtQuick 2.0}. \since QtQuick 2.0 */ |