diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-27 20:23:57 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-27 22:10:06 +0200 |
commit | abe319c9cb811832bb4c9c95290564dfa7b3603a (patch) | |
tree | e93b7e554b3cd497b86f0be3bd46450a91ea088e /src/controls/doc | |
parent | efdd81ce80b018b7b5779876e94f1b722af7fb9a (diff) | |
parent | 69b3136bae16897492d27558c5909cd61a5e598e (diff) | |
download | qtquickcontrols-abe319c9cb811832bb4c9c95290564dfa7b3603a.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp
Change-Id: I0b6018fdac65a5385136e4c3561fba1c52ecd32e
Diffstat (limited to 'src/controls/doc')
-rw-r--r-- | src/controls/doc/src/qtquickcontrols-examples.qdoc | 6 | ||||
-rw-r--r-- | src/controls/doc/src/qtquickcontrols-tableview.qdoc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/controls/doc/src/qtquickcontrols-examples.qdoc b/src/controls/doc/src/qtquickcontrols-examples.qdoc index 70c8eabb..08f61e10 100644 --- a/src/controls/doc/src/qtquickcontrols-examples.qdoc +++ b/src/controls/doc/src/qtquickcontrols-examples.qdoc @@ -46,7 +46,7 @@ <tr><td style="border:0px"> \endraw \image qtquickcontrols-example-gallery-osx.png - \caption OS X + \caption \macos \raw HTML </td><td style="border:0px"> \endraw @@ -157,7 +157,7 @@ import org.qtproject.example 1.0 \endcode - For more information about registering C++ classses as QML types, see + For more information about registering C++ classes as QML types, see \l {Defining QML Types from C++}. \include examples-run.qdocinc @@ -198,7 +198,7 @@ import org.qtproject.example 1.0 \endcode - For more information about registering C++ classses as QML types, see + For more information about registering C++ classes as QML types, see \l {Defining QML Types from C++}. \include examples-run.qdocinc diff --git a/src/controls/doc/src/qtquickcontrols-tableview.qdoc b/src/controls/doc/src/qtquickcontrols-tableview.qdoc index cf86174a..ba16b115 100644 --- a/src/controls/doc/src/qtquickcontrols-tableview.qdoc +++ b/src/controls/doc/src/qtquickcontrols-tableview.qdoc @@ -243,7 +243,7 @@ \endcode \b Example: To iterate over selected indexes, you can pass a callback function. - \a rowIndex is passed as as an argument to the callback function. + \a rowIndex is passed as an argument to the callback function. \code tableview.selection.forEach( function(rowIndex) {console.log(rowIndex)} ) \endcode |