aboutsummaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2012-03-27 15:20:42 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-12 08:30:49 +0200
commit1b0bcbbe749529c9b3c37f79f9535293544c4fbb (patch)
treee82eaff4ef787bc55117cb0e3b2b091f72e0365b /doc/src
parent3787a0813e3b3408456546e46ac679fd44bc9149 (diff)
Doc: Fixing the Qt QML module page.
Change-Id: I0efffbab650423a78de437459c9060594f895f37 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/qml/qtqml.qdoc (renamed from doc/src/qml/qtdeclarative.qdoc)12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/qml/qtdeclarative.qdoc b/doc/src/qml/qtqml.qdoc
index 5ad637ab50..7bd797e8d0 100644
--- a/doc/src/qml/qtdeclarative.qdoc
+++ b/doc/src/qml/qtqml.qdoc
@@ -27,10 +27,10 @@
/*!
\module QtQml
- \title Qt Qml Module
+ \title Qt QML Module
\ingroup modules
- \brief The Qt Qml module provides a declarative framework
+ \brief The Qt QML module provides a declarative framework
for building highly dynamic, custom user interfaces.
To include the definitions of the module's classes, use the
@@ -47,8 +47,8 @@
QT += qml
\endcode
- For more information on the Qt Qml module (including the visual
- elements which are implemented on top of the Qt Qml module) see the
+ For more information on the Qt QML module (including the visual
+ elements which are implemented on top of the Qt QML module) see the
\l{Qt Quick} documentation.
*/
@@ -68,7 +68,7 @@
Declares additional properties of the given \a Type as described by the
specified \a Flags.
-
+
Current the only supported type info is \c QML_HAS_ATTACHED_PROPERTIES which
declares that the \a Type supports \l {Attached Properties}.
@@ -113,7 +113,7 @@
qmlRegisterType<MySliderItem>("com.mycompany.qmlcomponents", 1, 0, "Slider");
\endcode
- Once this is registered, the type can be used in QML by importing the
+ Once this is registered, the type can be used in QML by importing the
specified module name and version number:
\qml