diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-06 13:31:44 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-06 13:31:45 +0200 |
commit | 3703d57161dc4ad7df000403bfcc43ac78eb6617 (patch) | |
tree | 4ab8ca921336f38ca539b699c6f4c0d7dc3de949 /examples/quickcontrols2/texteditor/doc/src | |
parent | 94fdd09199b3373bc6d6e9d9c873cd16d54184a5 (diff) | |
parent | 567a5cf69ef39ba5e9d0558ee7d6caec4d69bf71 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: Ie9314e1a5daa20cee9d95a3c42873dbe515b3333
Diffstat (limited to 'examples/quickcontrols2/texteditor/doc/src')
-rw-r--r-- | examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc b/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc index 3e9a9268..28cf3f3b 100644 --- a/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc +++ b/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc @@ -30,7 +30,7 @@ \title Qt Quick Controls - Text Editor \keyword Qt Quick Controls 2 - Text Editor \ingroup qtquickcontrols2-examples - \brief A QML app using Qt Quick Controls 2 and a C++ class to + \brief A QML app using Qt Quick Controls and a C++ class to provide a fully-functional rich-text editor application. The \e {Text Editor Example} presents a sample HTML file using the TextArea @@ -77,7 +77,7 @@ The touch user interface is a simplified version of the text editor. It is suitable for touch devices with limited screen size. The example uses - \l{Using File Selectors with Qt Quick Controls 2}{file selectors} to load + \l{Using File Selectors with Qt Quick Controls}{file selectors} to load the appropriate user interface automatically. Unlike the desktop version, which uses top-level dialogs, the touch version |