qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Examples: Replace qt-5 urls 

Pick-to: 6.3
Change-Id: Ifec0960bfb3f179e2cf5ff5e7f11364b106a86e3
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
This commit is contained in:
Kai Köhne 2022-06-02 17:47:20 +02:00
parent dda364c148
commit 21a17fbd89
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/qml/networkaccessmanagerfactory/view.qml
View File

@ -53,5 +53,5 @@ import QtQuick 2.0
Image { Image {
width: 200 width: 200
height: 100 height: 100
source: "http://doc.qt.io/qt-5/images/logo.png" source: "http://doc.qt.io/qt-6/images/logo.png"
} }

2
examples/quickcontrols2/gallery/gallery.qml
View File

@ -66,7 +66,7 @@ ApplicationWindow {
let displayingControl = listView.currentIndex !== -1 let displayingControl = listView.currentIndex !== -1
let currentControlName = displayingControl let currentControlName = displayingControl
? listView.model.get(listView.currentIndex).title.toLowerCase() : "" ? listView.model.get(listView.currentIndex).title.toLowerCase() : ""
let url = "https://doc.qt.io/qt-5/" let url = "https://doc.qt.io/qt-6/"
+ (displayingControl + (displayingControl
? "qml-qtquick-controls2-" + currentControlName + ".html" ? "qml-qtquick-controls2-" + currentControlName + ".html"
: "qtquick-controls2-qmlmodule.html"); : "qtquick-controls2-qmlmodule.html");

8
examples/quickcontrols2/texteditor/example.md
View File

@ -71,9 +71,9 @@ John MacFarlane writes:
## Hyperlinks ## Hyperlinks
Hyperlinks can be written with the link text first, and the URL immediately 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 There are also "reference links" where the link text is first labeled
and then the URL for the label is given elsewhere: and then the URL for the label is given elsewhere:
@ -104,7 +104,7 @@ to form a task list.
- List items can include images: ![red square](red.png) - List items can include images: ![red square](red.png)
- and even nested quotes, like this: - 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 points out that
> The TextEdit item displays a block of editable, formatted text. > 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 # Related Work
Some Qt Widgets also support Markdown. 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 editing features as TextEdit and TextArea: you can edit the rendered text
directly. You can use directly. You can use
[QTextDocument::toMarkdown](https://doc-snapshots.qt.io/qt5-dev/qtextdocument.html#toMarkdown) [QTextDocument::toMarkdown](https://doc-snapshots.qt.io/qt5-dev/qtextdocument.html#toMarkdown)