aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2015-10-14 13:50:13 +0200
committerNico Vertriest <nico.vertriest@digia.com>2015-10-15 13:26:18 +0000
commitc3bfb4f9ca9dacdfbe81e6a594d18b6070f0edbc (patch)
treea08bd45c538640d34be1f8f7f0be41b1ad4279ac /src/quick
parent5b726c3135f7a86e9712d393ae5e75cca73b8e57 (diff)
Doc: corrected syntax errors \qmlmethod
Task-number: QTBUG-43810 Change-Id: I694e9046ba32144b084277637b47d7ce23c633a9 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/quick')
-rw-r--r--src/quick/util/qquickfontmetrics.cpp3
-rw-r--r--src/quick/util/qquicktextmetrics.cpp2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/quick/util/qquickfontmetrics.cpp b/src/quick/util/qquickfontmetrics.cpp
index a87ec7d60a..0e3556be86 100644
--- a/src/quick/util/qquickfontmetrics.cpp
+++ b/src/quick/util/qquickfontmetrics.cpp
@@ -319,8 +319,7 @@ QRectF QQuickFontMetrics::tightBoundingRect(const QString &text) const
}
/*!
- \qmlmethod string QtQuick::FontMetrics::elidedText(string text, enum mode,
- qreal width, int flags)
+ \qmlmethod string QtQuick::FontMetrics::elidedText(string text, enumeration mode, real width, int flags)
This method returns a returns an elided version of the string (i.e., a
string with "..." in it) if the string \a text is wider than \a width.
diff --git a/src/quick/util/qquicktextmetrics.cpp b/src/quick/util/qquicktextmetrics.cpp
index 1dd787f4a5..13ccb515ce 100644
--- a/src/quick/util/qquicktextmetrics.cpp
+++ b/src/quick/util/qquicktextmetrics.cpp
@@ -244,7 +244,7 @@ QRectF QQuickTextMetrics::tightBoundingRect() const
}
/*!
- \qmlmethod string QtQuick::TextMetrics::elidedText
+ \qmlproperty string QtQuick::TextMetrics::elidedText
This property holds an elided version of the string (i.e., a string with
"..." in it) if the string \l text is wider than \l elideWidth. If the