diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:36:04 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:36:04 +0100 |
commit | ad67ec26d0cbc98e3440dd38bb20eef4da2ee96d (patch) | |
tree | 9f8135751df2f995a4f55837ea065a4687245b71 /src/quick/util/qquicktextmetrics.cpp | |
parent | 83a16630c13969e68cd3a5aaab73335ccb0d4414 (diff) | |
parent | 20d160d0513a04be187ed851a25b029f47c27b27 (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
LICENSE.GPLv2
examples/qml/networkaccessmanagerfactory/view.qml
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4stringobject.cpp
Change-Id: I5d12f436d60995e51d5c2f59d364e9cbc24f8e32
Diffstat (limited to 'src/quick/util/qquicktextmetrics.cpp')
-rw-r--r-- | src/quick/util/qquicktextmetrics.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/util/qquicktextmetrics.cpp b/src/quick/util/qquicktextmetrics.cpp index a0b8ecaa6e..1dd787f4a5 100644 --- a/src/quick/util/qquicktextmetrics.cpp +++ b/src/quick/util/qquicktextmetrics.cpp @@ -131,7 +131,7 @@ void QQuickTextMetrics::setText(const QString &text) \li \c Qt::ElideRight - For example: "Hello..." \endlist - \sa elideWidth, elidedText + \sa elideWidth, QFontMetrics::elidedText */ Qt::TextElideMode QQuickTextMetrics::elide() const { @@ -153,7 +153,7 @@ void QQuickTextMetrics::setElide(Qt::TextElideMode elide) This property holds the largest width the text can have (in pixels) before eliding will occur. - \sa elide, elidedText + \sa elide, QFontMetrics::elidedText */ qreal QQuickTextMetrics::elideWidth() const { |