diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-30 14:12:24 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-30 14:12:24 (GMT) |
| commit | 41f8b74b2c133ddc79962c75fd22e335caec0f0f (patch) | |
| tree | 8b973758cbce29d437b5d73436d5907cfe197ec5 | |
| parent | 70fd09b335f60be7b68f258c47abe2bb092d5775 (diff) | |
| download | Qt-41f8b74b2c133ddc79962c75fd22e335caec0f0f.zip Qt-41f8b74b2c133ddc79962c75fd22e335caec0f0f.tar.gz Qt-41f8b74b2c133ddc79962c75fd22e335caec0f0f.tar.bz2 | |
Doc: Shorten lists of basic QML types.
| -rw-r--r-- | doc/src/declarative/extending-tutorial.qdoc | 14 | ||||
| -rw-r--r-- | doc/src/declarative/extending.qdoc | 19 |
2 files changed, 11 insertions, 22 deletions
diff --git a/doc/src/declarative/extending-tutorial.qdoc b/doc/src/declarative/extending-tutorial.qdoc index 349ac30..1e5441b 100644 --- a/doc/src/declarative/extending-tutorial.qdoc +++ b/doc/src/declarative/extending-tutorial.qdoc @@ -290,19 +290,13 @@ enum-type property to store a display mode for each chart: \endcode We can also use various other property types. QML has built-in support for the following -types: +types listed in the \l{Extending Types from QML} document, including the following: \list -\o bool -\o unsigned int, int -\o float, double, qreal -\o QString -\o QUrl -\o QColor +\o bool, unsigned int, int, float, double, qreal +\o QString, QUrl, QColor \o QDate, QTime, QDateTime -\o QPoint, QPointF -\o QSize, QSizeF -\o QRect, QRectF +\o QPoint, QPointF, QSize, QSizeF, QRect, QRectF \o QVariant \endlist diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc index 0cc989d..0c41c93 100644 --- a/doc/src/declarative/extending.qdoc +++ b/doc/src/declarative/extending.qdoc @@ -80,19 +80,14 @@ Types can be registered by libraries, application code, or by plugins Once registered, all \l {Qt's Property System}{properties} of the supported types are available in QML. QML has intrinsic support for -properties of these types: +properties of the types listed in the \l{Extending Types from QML} +document, including the following: \list -\o bool -\o unsigned int, int -\o float, double, qreal -\o QString -\o QUrl -\o QColor +\o bool, unsigned int, int, float, double, qreal +\o QString, QUrl, QColor \o QDate, QTime, QDateTime -\o QPoint, QPointF -\o QSize, QSizeF -\o QRect, QRectF +\o QPoint, QPointF, QSize, QSizeF, QRect, QRectF \o QVariant \endlist @@ -432,7 +427,7 @@ on<Property-name>Changed, regardless of the name used for the NOTIFY signal in C++. We recommend using <property-name>Changed() for the NOTIFY signal in C++. -See also \l {Extending types from QML}. +See also \l {Extending Types from QML}. \section1 Methods @@ -640,7 +635,7 @@ public: /*! \page qml-extending-types.html -\title Extending types from QML +\title Extending Types from QML Many of the elements available for use in QML are implemented in \l {Extending QML in C++}{C++}. These types are know as "core types". QML |