diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-25 09:53:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 12:15:55 +0200 |
| commit | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (patch) | |
| tree | 18e22092c2764fea16442fd814f230d4fe095a49 /src/qml/doc/src | |
| parent | c21a6a9f2c2d635aca3bf88a6431c560b16b1cc6 (diff) | |
| parent | 9999591e69a0908cd3fbe14646fb98881e32061b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/quick/handlers/qquickhandlerpoint.cpp
src/quick/handlers/qquicksinglepointhandler.cpp
tests/auto/qml/ecmascripttests/test262
Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
Diffstat (limited to 'src/qml/doc/src')
| -rw-r--r-- | src/qml/doc/src/javascript/date.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/javascript/number.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/javascript/string.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/qtqml-cpp.qdoc | 10 |
4 files changed, 6 insertions, 10 deletions
diff --git a/src/qml/doc/src/javascript/date.qdoc b/src/qml/doc/src/javascript/date.qdoc index 7b574e7c3b..431f9649a0 100644 --- a/src/qml/doc/src/javascript/date.qdoc +++ b/src/qml/doc/src/javascript/date.qdoc @@ -28,7 +28,7 @@ /*! \qmltype Date \inqmlmodule QtQml - \brief Provides date functions + \brief Provides date functions. The QML Date object extends the \l{Mozilla Developer Network Date Reference}{JS Date object} with diff --git a/src/qml/doc/src/javascript/number.qdoc b/src/qml/doc/src/javascript/number.qdoc index 5230d08bc9..b6f80f474a 100644 --- a/src/qml/doc/src/javascript/number.qdoc +++ b/src/qml/doc/src/javascript/number.qdoc @@ -28,7 +28,7 @@ /*! \qmltype Number \inqmlmodule QtQml - \brief The Number object provides represents a number value + \brief The Number object provides represents a number value. The QML Number object extends the JS Number object with locale aware functions. diff --git a/src/qml/doc/src/javascript/string.qdoc b/src/qml/doc/src/javascript/string.qdoc index c434bb867d..f896af3378 100644 --- a/src/qml/doc/src/javascript/string.qdoc +++ b/src/qml/doc/src/javascript/string.qdoc @@ -28,7 +28,7 @@ /*! \qmltype String \inqmlmodule QtQml - \brief The String object represents a string value + \brief The String object represents a string value. The QML String object extends the JS String object with the arg() function. diff --git a/src/qml/doc/src/qtqml-cpp.qdoc b/src/qml/doc/src/qtqml-cpp.qdoc index fd45222d85..971bb88825 100644 --- a/src/qml/doc/src/qtqml-cpp.qdoc +++ b/src/qml/doc/src/qtqml-cpp.qdoc @@ -29,21 +29,17 @@ \title Qt QML C++ Classes \ingroup modules \qtvariable qml -\brief The C++ API provided by the Qt QML module +\brief The C++ API provided by the Qt QML module. To include the definitions of the module's classes, use the following directive: -\code -#include <QtQml> -\endcode +\snippet code/doc_src_qtqml.cpp 0 To link against the module, add this line to your \l qmake \c .pro file: -\code -QT += qml -\endcode +\snippet code/doc_src_qtqml.pro 0 For more information on the Qt QML module, see the \l{Qt QML} module documentation. |