diff options
-rw-r--r-- | doc/src/qml/qtqml.qdoc (renamed from doc/src/qml/qtdeclarative.qdoc) | 12 | ||||
-rw-r--r-- | src/qml/qml/qqmllist.cpp | 2 |
2 files changed, 7 insertions, 7 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 diff --git a/src/qml/qml/qqmllist.cpp b/src/qml/qml/qqmllist.cpp index ad28e38a64..c3537dac9d 100644 --- a/src/qml/qml/qqmllist.cpp +++ b/src/qml/qml/qqmllist.cpp @@ -88,7 +88,7 @@ void QQmlListReferencePrivate::release() /*! \class QQmlListReference \since 5.0 -\module QtQml +\inmodule QtQml \brief The QQmlListReference class allows the manipulation of QQmlListProperty properties. QQmlListReference allows C++ programs to read from, and assign values to a QML list property in a |