diff options
| author | Nico Vertriest <nico.vertriest@digia.com> | 2015-10-09 15:28:43 +0200 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@digia.com> | 2015-11-09 12:31:58 +0000 |
| commit | f2ebdc79b6daf43f10402a9bd11516f5a41c38d3 (patch) | |
| tree | f345f1e26f32b586d700689c745b5f0edfffa928 | |
| parent | 2058d8b2dde758fc8db8d9676a8f5e546629034f (diff) | |
| download | qtdoc-f2ebdc79b6daf43f10402a9bd11516f5a41c38d3.tar.gz | |
Doc: corrected link issues
Change-Id: Iad431288e7baeedf4cfdb696f401b6999dbdf692
Task-number: QTBUG-43810
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
| -rw-r--r-- | doc/src/getting-started/controls-texteditor.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/platforms/platform-notes-android.qdoc | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/src/getting-started/controls-texteditor.qdoc b/doc/src/getting-started/controls-texteditor.qdoc index a0c99ca6..8b9c8601 100644 --- a/doc/src/getting-started/controls-texteditor.qdoc +++ b/doc/src/getting-started/controls-texteditor.qdoc @@ -244,7 +244,7 @@ In the \uicontrol Navigator window, make sure that the tool bar is a child of th application window. To make the tool bar a child of the window, simply drag the tool bar underneath the application window. -Within the tool bar, we need a \e{row} layout. Drag the \e{Row Layout} into the +Within the tool bar, we need a \e{row} layout. Drag the \e{row} layout into the \uicontrol Navigator window and set it to be a child of the tool bar. Similarly, set these layout properties: @@ -374,7 +374,7 @@ The wizard creates a \uicontrol DocumentHandler class in two files, There are two functionalities we can expose to QML, the file loading and saving. We can do this by creating \e properties and binding them to C++ -functions through \l{Qt's Property System}. +functions through the \l{The Property System}{Qt Property System}. In the \e documenthandler.h header file, add the following functions with their respective access modifier: diff --git a/doc/src/platforms/platform-notes-android.qdoc b/doc/src/platforms/platform-notes-android.qdoc index 0b501d0d..9cf572ec 100644 --- a/doc/src/platforms/platform-notes-android.qdoc +++ b/doc/src/platforms/platform-notes-android.qdoc @@ -156,7 +156,9 @@ or later. This affects camera preview and video player features. Additionally, the \l{Qt Multimedia Widgets} module is not supported on Android, which means - video display is only available using the VideoOutput and \l{QtMultimedia::Video}{Video} QML items. + video display is only available using the VideoOutput and the \l [QML]{QtMultimedia::}{Video} + QML Type. + \section1 Assets File System |