diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 18:51:21 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-07 18:51:21 +0200 |
commit | 42aaff003d27ed9ba75d48a4e02a83fd5c1eade9 (patch) | |
tree | 2c8a5d2ec58e7be3c3af51f88cf6d05864df6f34 /examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc | |
parent | 6b55e00eb94b138f39becac1bddaa5f3e42136dc (diff) | |
parent | e15a6a37d297bb466b96c3baf6073cc971c56ba2 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I23522a8f71cea8d8e3f0155dad98e41c003774fb
Diffstat (limited to 'examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc')
-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 |