aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/items
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2011-11-14 13:14:02 +1000
committerQt by Nokia <qt-info@nokia.com>2011-11-14 05:01:20 +0100
commit080af75aca6511f4a9408b38cd092283211c9422 (patch)
treeb1ad8e396b9801a88adb8e362b8d19439e7bc474 /src/declarative/items
parentd7e6194b7ba5c3e13d5160109e02620a237206a0 (diff)
Text.onLineLaidOut doc does not appear
Task-number: QTBUG-22706 Change-Id: I2b8b7d4012e48ff4226f060a5ce38d2acdab0deb Reviewed-by: Yann Bodson <yann.bodson@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/items')
-rw-r--r--src/declarative/items/qquicktext.cpp54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/declarative/items/qquicktext.cpp b/src/declarative/items/qquicktext.cpp
index 26f95438cb..4a3308626a 100644
--- a/src/declarative/items/qquicktext.cpp
+++ b/src/declarative/items/qquicktext.cpp
@@ -444,33 +444,6 @@ void QQuickText::doLayout()
d->updateSize();
}
-/*!
- \qmlsignal QtQuick2::Text::onLineLaidOut(line)
-
- This handler is called for every line during the layout process.
- This gives the opportunity to position and resize a line as it is being laid out.
- It can for example be used to create columns or lay out text around objects.
-
- The properties of a line are:
- \list
- \o number (read-only)
- \o x
- \o y
- \o width
- \o height
- \endlist
-
- For example, this will move the first 5 lines of a text element by 100 pixels to the right:
- \code
- onLineLaidOut: {
- if (line.number < 5) {
- line.x = line.x + 100
- line.width = line.width - 100
- }
- }
- \endcode
-*/
-
bool QQuickTextPrivate::isLineLaidOutConnected()
{
static int idx = this->signalIndex("lineLaidOut(QQuickTextLine*)");
@@ -954,6 +927,33 @@ QQuickText::~QQuickText()
*/
/*!
+ \qmlsignal QtQuick2::Text::onLineLaidOut(line)
+
+ This handler is called for every line during the layout process.
+ This gives the opportunity to position and resize a line as it is being laid out.
+ It can for example be used to create columns or lay out text around objects.
+
+ The properties of a line are:
+ \list
+ \o number (read-only)
+ \o x
+ \o y
+ \o width
+ \o height
+ \endlist
+
+ For example, this will move the first 5 lines of a text element by 100 pixels to the right:
+ \code
+ onLineLaidOut: {
+ if (line.number < 5) {
+ line.x = line.x + 100
+ line.width = line.width - 100
+ }
+ }
+ \endcode
+*/
+
+/*!
\qmlsignal QtQuick2::Text::onLinkActivated(string link)
This handler is called when the user clicks on a link embedded in the text.