aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Di Sera <luca.disera@qt.io>2021-09-22 17:03:19 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-09-23 17:37:53 +0000
commit930b39304c859202d9cfd923ede447bc7f3616f9 (patch)
tree635ab456fbd9e280802e59384284159cfa9fd0af
parentd0618c2133052102a04a91fccd06e33df4c681d9 (diff)
Doc: Repair broken links to the TextMetrics Qml type
The `FontMetrics` Qml type documentation links to the tighly related `TextMetrics` Qml type. The links were spelled as pointing to instantiating class `QQuickTextmetrics` instead of the Qml type `TextMetrics` in `QtQuick`, resulting in a link to a non-existing page. The relevant links were updated to point to `QtQuick::TextMetrics` resolving the linking issue. Furthermore, all the links were of the form `\l{link to some property X of TextMetrics}{...} property of \l {link the same property X}{TextMetrics}`. The second link in the pattern points to the same property as the link right before it but shows a link-text that expresses that it should point to the page of the whole type. Both to adjust the latter links and to simplify them, the pattern was changed to `\l{link to some property X of TextMetrics}{...} property of TextMetrics`, leaving the second link in the hand of QDoc's autolinker. Task-number: QTBUG-96127 Change-Id: I0e5c325d55193baa5a6bc3c6fae021d41fb32f3f Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 5eee691d93e06563a591c63c2fae3513e2493eb7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/quick/util/qquickfontmetrics.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quick/util/qquickfontmetrics.cpp b/src/quick/util/qquickfontmetrics.cpp
index ed9759d25f..b365ade5db 100644
--- a/src/quick/util/qquickfontmetrics.cpp
+++ b/src/quick/util/qquickfontmetrics.cpp
@@ -280,8 +280,8 @@ qreal QQuickFontMetrics::lineWidth() const
string should be drawn.
This method is offered as an imperative alternative to the
- \l {QQuickTextMetrics::advanceWidth}{advanceWidth} property of
- \l {QQuickTextMetrics::advanceWidth}{TextMetrics}.
+ \l {QtQuick::TextMetrics::advanceWidth}{advanceWidth} property of
+ TextMetrics.
\sa {QFontMetricsF::horizontalAdvance()}, {QFontMetricsF::height()}
*/
@@ -297,8 +297,8 @@ qreal QQuickFontMetrics::advanceWidth(const QString &text) const
specified by \a text.
This method is offered as an imperative alternative to the
- \l {QQuickTextMetrics::boundingRect}{boundingRect} property of
- \l {QQuickTextMetrics::boundingRect}{TextMetrics}.
+ \l {QtQuick::TextMetrics::boundingRect}{boundingRect} property of
+ TextMetrics.
\sa {QFontMetricsF::boundingRect()}, tightBoundingRect()
*/
@@ -314,8 +314,8 @@ QRectF QQuickFontMetrics::boundingRect(const QString &text) const
string specified by \a text.
This method is offered as an imperative alternative to the
- \l {QQuickTextMetrics::tightBoundingRect}{tightBoundingRect} property of
- \l {QQuickTextMetrics::tightBoundingRect}{TextMetrics}.
+ \l {QtQuick::TextMetrics::tightBoundingRect}{tightBoundingRect} property of
+ TextMetrics.
\sa {QFontMetricsF::tightBoundingRect()}, boundingRect()
*/
@@ -338,8 +338,8 @@ QRectF QQuickFontMetrics::tightBoundingRect(const QString &text) const
\l {Qt::TextShowMnemonic}.
This method is offered as an imperative alternative to the
- \l {QQuickTextMetrics::elidedText}{elidedText} property of
- \l {QQuickTextMetrics::elidedText}{TextMetrics}.
+ \l {QtQuick::TextMetrics::elidedText}{elidedText} property of
+ TextMetrics.
\sa Qt::TextElideMode, QFontMetricsF::elidedText()
*/