diff options
author | Topi Reinio <topi.reinio@digia.com> | 2013-11-26 11:15:05 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-30 17:57:40 +0100 |
commit | 86b3c8b26dcebb2ced30c52eddf2ffb5e9c52762 (patch) | |
tree | 7528c78684b3d6a9e6e7bcfd8952bbaad8b770f2 /src/quick | |
parent | 65e089766c5ae9345a8dd7dab7c54273713df3c0 (diff) |
Doc: Change the order of QQuickText function definitions
For Text QML type, some property and method documentation
is missing from the output because in the source file,
they appear before the '\qmltype Text' command.
This change reorders the functions so that qdoc will see
all documentation for Text QML type.
Task-number: QTBUG-35018
Change-Id: Icd995f66679d5105912ee12a7aeffd510921a54d
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/items/qquicktext.cpp | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index d62bf8efa1..ad904a2579 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -297,44 +297,6 @@ qreal QQuickTextPrivate::getImplicitHeight() const return implicitHeight; } -/*! - \qmlproperty enumeration QtQuick::Text::renderType - - Override the default rendering type for this component. - - Supported render types are: - \list - \li Text.QtRendering - the default - \li Text.NativeRendering - \endlist - - Select Text.NativeRendering if you prefer text to look native on the target platform and do - not require advanced features such as transformation of the text. Using such features in - combination with the NativeRendering render type will lend poor and sometimes pixelated - results. - - On HighDpi "retina" displays and mobile and embedded platforms, this property is ignored - and QtRendering is always used. -*/ -QQuickText::RenderType QQuickText::renderType() const -{ - Q_D(const QQuickText); - return d->renderType; -} - -void QQuickText::setRenderType(QQuickText::RenderType renderType) -{ - Q_D(QQuickText); - if (d->renderType == renderType) - return; - - d->renderType = renderType; - emit renderTypeChanged(); - - if (isComponentComplete()) - d->updateLayout(); -} - void QQuickText::q_imagesLoaded() { Q_D(QQuickText); @@ -641,17 +603,6 @@ void QQuickTextLine::setY(qreal y) m_line->setPosition(QPointF(m_line->x(), y)); } -/*! - \qmlmethod QtQuick::Text::doLayout() - - Triggers a re-layout of the displayed text. -*/ -void QQuickText::doLayout() -{ - Q_D(QQuickText); - d->updateSize(); -} - bool QQuickTextPrivate::isLineLaidOutConnected() { Q_Q(QQuickText); @@ -2665,4 +2616,53 @@ void QQuickText::hoverLeaveEvent(QHoverEvent *event) d->processHoverEvent(event); } +/*! + \qmlproperty enumeration QtQuick::Text::renderType + + Override the default rendering type for this component. + + Supported render types are: + \list + \li Text.QtRendering - the default + \li Text.NativeRendering + \endlist + + Select Text.NativeRendering if you prefer text to look native on the target platform and do + not require advanced features such as transformation of the text. Using such features in + combination with the NativeRendering render type will lend poor and sometimes pixelated + results. + + On HighDpi "retina" displays and mobile and embedded platforms, this property is ignored + and QtRendering is always used. +*/ +QQuickText::RenderType QQuickText::renderType() const +{ + Q_D(const QQuickText); + return d->renderType; +} + +void QQuickText::setRenderType(QQuickText::RenderType renderType) +{ + Q_D(QQuickText); + if (d->renderType == renderType) + return; + + d->renderType = renderType; + emit renderTypeChanged(); + + if (isComponentComplete()) + d->updateLayout(); +} + +/*! + \qmlmethod QtQuick::Text::doLayout() + + Triggers a re-layout of the displayed text. +*/ +void QQuickText::doLayout() +{ + Q_D(QQuickText); + d->updateSize(); +} + QT_END_NAMESPACE |