diff options
| author | Frederik Schwarzer <frederik.schwarzer@basyskom.com> | 2017-02-06 11:21:31 +0100 |
|---|---|---|
| committer | Frederik Schwarzer <frederik.schwarzer@basyskom.com> | 2017-02-06 11:21:08 +0000 |
| commit | f89e7596b76ea4d3444f187e425ce7fec9d3a635 (patch) | |
| tree | 6059f89bae1db5ea2bf2f81983d75ae38d98e402 /src/qml/doc/src/cppintegration | |
| parent | b7090f1334ac7b8ad2548f084c749eda4fa82451 (diff) | |
QDoc: sync description with described code layout
The table with several code examples was rearranged once and
the code description still refers to the old layout.
Old: left-right
New: upper-lower but with labels for C++ and QML code so it's safe to
refer to the labels.
Change-Id: I0edb9adc747b5081ec52445e132ce38784703e46
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/qml/doc/src/cppintegration')
| -rw-r--r-- | src/qml/doc/src/cppintegration/data.qdoc | 11 | ||||
| -rw-r--r-- | src/qml/doc/src/cppintegration/exposecppattributes.qdoc | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc index ac6600f38c..4523ee39d8 100644 --- a/src/qml/doc/src/cppintegration/data.qdoc +++ b/src/qml/doc/src/cppintegration/data.qdoc @@ -167,9 +167,9 @@ additional features. See the \l {qtqml-javascript-hostenvironment.html} The QML engine provides automatic type conversion between QVariantList and JavaScript arrays, and between QVariantMap and JavaScript objects. -For example, the function defined in QML below left expects two arguments, an +For example, the function defined in QML below expects two arguments, an array and an object, and prints their contents using the standard JavaScript -syntax for array and object item access. The C++ code below right calls this +syntax for array and object item access. The C++ code below calls this function, passing a QVariantList and a QVariantMap, which are automatically converted to JavaScript array and object values, repectively: @@ -204,9 +204,9 @@ when it is passed to C++. The QML engine provides automatic type conversion between QDateTime values and JavaScript \c Date objects. -For example, the function defined in QML below left expects a JavaScript +For example, the function defined in QML below expects a JavaScript \c Date object, and also returns a new \c Date object with the current date and -time. The C++ code below right calls this function, passing a QDateTime value +time. The C++ code below calls this function, passing a QDateTime value that is automatically converted by the engine into a \c Date object when it is passed to the \c readDate() function. In turn, the readDate() function returns a \c Date object that is automatically converted into a QDateTime value when it @@ -215,7 +215,7 @@ is received in C++: \table \header \row - +\li QML \li \qml // MyItem.qml @@ -227,6 +227,7 @@ Item { } \endqml \row +\li C++ \li \code // C++ diff --git a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc index ed0d049564..3bffd2eb6f 100644 --- a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc +++ b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc @@ -390,8 +390,8 @@ that is a public slot: \endcode If an instance of \c MessageBoard was set as the context data for a file \c -MyItem.qml, as shown below left, then \c MyItem.qml could invoke the two -methods, as shown below right: +MyItem.qml, then \c MyItem.qml could invoke the two methods as shown in the +examples below: \table \row |