diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-06-02 17:47:20 +0200 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2022-06-05 13:39:35 +0200 |
| commit | 21a17fbd891fedfc47be9c0cf260f7c76b884935 (patch) | |
| tree | a9436f2be184e43528bf1ed45027a85c81bc1b90 /examples | |
| parent | dda364c1489b0716bec0572d121361b3b3198c5c (diff) | |
Examples: Replace qt-5 urls
Pick-to: 6.3
Change-Id: Ifec0960bfb3f179e2cf5ff5e7f11364b106a86e3
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qml/networkaccessmanagerfactory/view.qml | 2 | ||||
| -rw-r--r-- | examples/quickcontrols2/gallery/gallery.qml | 2 | ||||
| -rw-r--r-- | examples/quickcontrols2/texteditor/example.md | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/qml/networkaccessmanagerfactory/view.qml b/examples/qml/networkaccessmanagerfactory/view.qml index da90e531b5..1c496bd623 100644 --- a/examples/qml/networkaccessmanagerfactory/view.qml +++ b/examples/qml/networkaccessmanagerfactory/view.qml @@ -53,5 +53,5 @@ import QtQuick 2.0 Image { width: 200 height: 100 - source: "http://doc.qt.io/qt-5/images/logo.png" + source: "http://doc.qt.io/qt-6/images/logo.png" } diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml index 58d1b49ece..1888a6b4c6 100644 --- a/examples/quickcontrols2/gallery/gallery.qml +++ b/examples/quickcontrols2/gallery/gallery.qml @@ -66,7 +66,7 @@ ApplicationWindow { let displayingControl = listView.currentIndex !== -1 let currentControlName = displayingControl ? listView.model.get(listView.currentIndex).title.toLowerCase() : "" - let url = "https://doc.qt.io/qt-5/" + let url = "https://doc.qt.io/qt-6/" + (displayingControl ? "qml-qtquick-controls2-" + currentControlName + ".html" : "qtquick-controls2-qmlmodule.html"); diff --git a/examples/quickcontrols2/texteditor/example.md b/examples/quickcontrols2/texteditor/example.md index 0ee17cdb9b..e385227e3b 100644 --- a/examples/quickcontrols2/texteditor/example.md +++ b/examples/quickcontrols2/texteditor/example.md @@ -71,9 +71,9 @@ John MacFarlane writes: ## Hyperlinks Hyperlinks can be written with the link text first, and the URL immediately -following: [Qt Assistant](http://doc.qt.io/qt-5/qtassistant-index.html) +following: [Qt Assistant](http://doc.qt.io/qt-6/qtassistant-index.html) -A plain url is automatically recognized: https://doc.qt.io/qt-5/qml-qtquick-text.html +A plain url is automatically recognized: https://doc.qt.io/qt-6/qml-qtquick-text.html There are also "reference links" where the link text is first labeled and then the URL for the label is given elsewhere: @@ -104,7 +104,7 @@ to form a task list. - List items can include images:  - and even nested quotes, like this: - The [Qt Documentation](https://doc.qt.io/qt-5/qml-qtquick-textedit.html#details) + The [Qt Documentation](https://doc.qt.io/qt-6/qml-qtquick-textedit.html#details) points out that > The TextEdit item displays a block of editable, formatted text. > @@ -155,7 +155,7 @@ One of the GitHub extensions is support for tables: # Related Work Some Qt Widgets also support Markdown. -[QTextEdit](https://doc.qt.io/qt-5/qtextedit.html) has similar WYSIWYG +[QTextEdit](https://doc.qt.io/qt-6/qtextedit.html) has similar WYSIWYG editing features as TextEdit and TextArea: you can edit the rendered text directly. You can use [QTextDocument::toMarkdown](https://doc-snapshots.qt.io/qt5-dev/qtextdocument.html#toMarkdown) |