summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-09-15 14:25:12 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-09-15 14:25:12 (GMT)
commit9a68fa7167cac5ebe98b23d598ab9be9012f2ef0 (patch)
tree377a542771d95f46445ea9a5d693d5857f138788
parenta4b6572b8fb8eb247a7bd952dca7e99e5d4e5707 (diff)
downloadQt-9a68fa7167cac5ebe98b23d598ab9be9012f2ef0.zip
Qt-9a68fa7167cac5ebe98b23d598ab9be9012f2ef0.tar.gz
Qt-9a68fa7167cac5ebe98b23d598ab9be9012f2ef0.tar.bz2
Doc: Minor improvements to QML-related documentation.
-rw-r--r--doc/src/declarative/qtdeclarative.qdoc7
-rw-r--r--doc/src/objectmodel/properties.qdoc2
-rw-r--r--src/declarative/graphicsitems/qdeclarativerectangle.cpp4
3 files changed, 6 insertions, 7 deletions
diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc
index 044758f..5232841 100644
--- a/doc/src/declarative/qtdeclarative.qdoc
+++ b/doc/src/declarative/qtdeclarative.qdoc
@@ -56,7 +56,7 @@
\macro QML_DECLARE_TYPE()
\relates QDeclarativeEngine
- Equivalent to Q_DECLARE_METATYPE(TYPE) and Q_DECLARE_METATYPE(QDeclarativeListProperty<TYPE>)
+ Equivalent to \c Q_DECLARE_METATYPE(TYPE) and \c Q_DECLARE_METATYPE(QDeclarativeListProperty<TYPE>)
*/
/*!
@@ -93,7 +93,7 @@
specified module name and version number:
\qml
- imoprt com.mycompany.qmlcomponents 1.0
+ import com.mycompany.qmlcomponents 1.0
Slider { ... }
\endqml
@@ -147,7 +147,7 @@
This will cause any QML which uses this module and attempts to use the type to produce an error message:
\code
-fun.qml: Get back to work, slacker!
+ fun.qml: Get back to work, slacker!
Game {
^
\endcode
@@ -176,6 +176,5 @@ fun.qml: Get back to work, slacker!
This template function registers the C++ type in the QML system
under the name \a typeName.
-
Returns the QML type id.
*/
diff --git a/doc/src/objectmodel/properties.qdoc b/doc/src/objectmodel/properties.qdoc
index 3a8e3b4..2cb7c04 100644
--- a/doc/src/objectmodel/properties.qdoc
+++ b/doc/src/objectmodel/properties.qdoc
@@ -29,7 +29,7 @@
\page properties.html
\title The Property System
\brief An overview of Qt's property system.
-
+
\ingroup qt-basic-concepts
\target Qt's Property System
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
index e33969d..9831d5f 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -85,8 +85,8 @@ void QDeclarativePen::setWidth(int w)
/*!
\qmlclass GradientStop QDeclarativeGradientStop
\ingroup qml-basic-visual-elements
- \since 4.7
- \brief The GradientStop item defines the color at a position in a Gradient
+ \since 4.7
+ \brief The GradientStop item defines the color at a position in a Gradient.
\sa Gradient
*/