aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquicktext.cpp
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2013-10-01 13:03:28 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-02 14:40:01 +0200
commit4706b1ceff9af9141044ed3cf020ce5624bfa40f (patch)
tree43672217a945512ddd1704468d1fd4b6e9c153c7 /src/quick/items/qquicktext.cpp
parent4f50ab594aa2fb1d38981127beca634ad3396489 (diff)
qdoc: no longer recognizes the version nr in QML refs
All QML references of the form <QML-module-name><QML-module-version>::<QML-type>::<member-name> have had the <QML-module-version> removed i. Task-number: QTBUG-33776 Change-Id: Idde279e0f254cd24ea44f9841662dd81a2c5bbc6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/quick/items/qquicktext.cpp')
-rw-r--r--src/quick/items/qquicktext.cpp80
1 files changed, 40 insertions, 40 deletions
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index ae9b081b43..fbda2df2dc 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -299,7 +299,7 @@ qreal QQuickTextPrivate::getImplicitHeight() const
}
/*!
- \qmlproperty enumeration QtQuick2::Text::renderType
+ \qmlproperty enumeration QtQuick::Text::renderType
Override the default rendering type for this component.
@@ -643,7 +643,7 @@ void QQuickTextLine::setY(qreal y)
}
/*!
- \qmlmethod QtQuick2::Text::doLayout()
+ \qmlmethod QtQuick::Text::doLayout()
Triggers a re-layout of the displayed text.
*/
@@ -1291,7 +1291,7 @@ QQuickText::~QQuickText()
}
/*!
- \qmlproperty bool QtQuick2::Text::clip
+ \qmlproperty bool QtQuick::Text::clip
This property holds whether the text is clipped.
Note that if the text does not fit in the bounding rectangle it will be abruptly chopped.
@@ -1300,7 +1300,7 @@ QQuickText::~QQuickText()
*/
/*!
- \qmlsignal QtQuick2::Text::onLineLaidOut(object line)
+ \qmlsignal QtQuick::Text::onLineLaidOut(object line)
This handler is called for each line of text that is laid out during the layout
process. The specified \a line object provides more details about the line that
@@ -1330,7 +1330,7 @@ QQuickText::~QQuickText()
*/
/*!
- \qmlsignal QtQuick2::Text::onLinkActivated(string link)
+ \qmlsignal QtQuick::Text::onLinkActivated(string link)
This handler is called when the user clicks on a link embedded in the text.
The link must be in rich text or HTML format and the
@@ -1346,7 +1346,7 @@ QQuickText::~QQuickText()
*/
/*!
- \qmlproperty string QtQuick2::Text::font.family
+ \qmlproperty string QtQuick::Text::font.family
Sets the family name of the font.
@@ -1356,13 +1356,13 @@ QQuickText::~QQuickText()
*/
/*!
- \qmlproperty bool QtQuick2::Text::font.bold
+ \qmlproperty bool QtQuick::Text::font.bold
Sets whether the font weight is bold.
*/
/*!
- \qmlproperty enumeration QtQuick2::Text::font.weight
+ \qmlproperty enumeration QtQuick::Text::font.weight
Sets the font's weight.
@@ -1381,31 +1381,31 @@ QQuickText::~QQuickText()
*/
/*!
- \qmlproperty bool QtQuick2::Text::font.italic
+ \qmlproperty bool QtQuick::Text::font.italic
Sets whether the font has an italic style.
*/
/*!
- \qmlproperty bool QtQuick2::Text::font.underline
+ \qmlproperty bool QtQuick::Text::font.underline
Sets whether the text is underlined.
*/
/*!
- \qmlproperty bool QtQuick2::Text::font.strikeout
+ \qmlproperty bool QtQuick::Text::font.strikeout
Sets whether the font has a strikeout style.
*/
/*!
- \qmlproperty real QtQuick2::Text::font.pointSize
+ \qmlproperty real QtQuick::Text::font.pointSize
Sets the font size in points. The point size must be greater than zero.
*/
/*!
- \qmlproperty int QtQuick2::Text::font.pixelSize
+ \qmlproperty int QtQuick::Text::font.pixelSize
Sets the font size in pixels.
@@ -1414,7 +1414,7 @@ QQuickText::~QQuickText()
*/
/*!
- \qmlproperty real QtQuick2::Text::font.letterSpacing
+ \qmlproperty real QtQuick::Text::font.letterSpacing
Sets the letter spacing for the font.
@@ -1423,7 +1423,7 @@ QQuickText::~QQuickText()
*/
/*!
- \qmlproperty real QtQuick2::Text::font.wordSpacing
+ \qmlproperty real QtQuick::Text::font.wordSpacing
Sets the word spacing for the font.
@@ -1433,7 +1433,7 @@ QQuickText::~QQuickText()
*/
/*!
- \qmlproperty enumeration QtQuick2::Text::font.capitalization
+ \qmlproperty enumeration QtQuick::Text::font.capitalization
Sets the capitalization for the text.
@@ -1485,7 +1485,7 @@ void QQuickText::setFont(const QFont &font)
}
/*!
- \qmlproperty string QtQuick2::Text::text
+ \qmlproperty string QtQuick::Text::text
The text to display. Text supports both plain and rich text strings.
@@ -1527,7 +1527,7 @@ void QQuickText::setText(const QString &n)
}
/*!
- \qmlproperty color QtQuick2::Text::color
+ \qmlproperty color QtQuick::Text::color
The text color.
@@ -1569,7 +1569,7 @@ void QQuickText::setColor(const QColor &color)
}
/*!
- \qmlproperty color QtQuick2::Text::linkColor
+ \qmlproperty color QtQuick::Text::linkColor
The color of links in the text.
@@ -1597,7 +1597,7 @@ void QQuickText::setLinkColor(const QColor &color)
}
/*!
- \qmlproperty enumeration QtQuick2::Text::style
+ \qmlproperty enumeration QtQuick::Text::style
Set an additional text style.
@@ -1641,7 +1641,7 @@ void QQuickText::setStyle(QQuickText::TextStyle style)
}
/*!
- \qmlproperty color QtQuick2::Text::styleColor
+ \qmlproperty color QtQuick::Text::styleColor
Defines the secondary color used by text styles.
@@ -1677,9 +1677,9 @@ void QQuickText::setStyleColor(const QColor &color)
}
/*!
- \qmlproperty enumeration QtQuick2::Text::horizontalAlignment
- \qmlproperty enumeration QtQuick2::Text::verticalAlignment
- \qmlproperty enumeration QtQuick2::Text::effectiveHorizontalAlignment
+ \qmlproperty enumeration QtQuick::Text::horizontalAlignment
+ \qmlproperty enumeration QtQuick::Text::verticalAlignment
+ \qmlproperty enumeration QtQuick::Text::effectiveHorizontalAlignment
Sets the horizontal and vertical alignment of the text within the Text items
width and height. By default, the text is vertically aligned to the top. Horizontal
@@ -1802,7 +1802,7 @@ void QQuickText::setVAlign(VAlignment align)
}
/*!
- \qmlproperty enumeration QtQuick2::Text::wrapMode
+ \qmlproperty enumeration QtQuick::Text::wrapMode
Set this property to wrap the text to the Text item's width. The text will only
wrap if an explicit width has been set. wrapMode can be one of:
@@ -1833,7 +1833,7 @@ void QQuickText::setWrapMode(WrapMode mode)
}
/*!
- \qmlproperty int QtQuick2::Text::lineCount
+ \qmlproperty int QtQuick::Text::lineCount
Returns the number of lines visible in the text item.
@@ -1848,7 +1848,7 @@ int QQuickText::lineCount() const
}
/*!
- \qmlproperty bool QtQuick2::Text::truncated
+ \qmlproperty bool QtQuick::Text::truncated
Returns true if the text has been truncated due to \l maximumLineCount
or \l elide.
@@ -1864,7 +1864,7 @@ bool QQuickText::truncated() const
}
/*!
- \qmlproperty int QtQuick2::Text::maximumLineCount
+ \qmlproperty int QtQuick::Text::maximumLineCount
Set this property to limit the number of lines that the text item will show.
If elide is set to Text.ElideRight, the text will be elided appropriately.
@@ -1904,7 +1904,7 @@ void QQuickText::resetMaximumLineCount()
}
/*!
- \qmlproperty enumeration QtQuick2::Text::textFormat
+ \qmlproperty enumeration QtQuick::Text::textFormat
The way the text property should be displayed.
@@ -2007,7 +2007,7 @@ void QQuickText::setTextFormat(TextFormat format)
}
/*!
- \qmlproperty enumeration QtQuick2::Text::elide
+ \qmlproperty enumeration QtQuick::Text::elide
Set this property to elide parts of the text fit to the Text item's width.
The text will only elide if an explicit width has been set.
@@ -2052,7 +2052,7 @@ void QQuickText::setElideMode(QQuickText::TextElideMode mode)
}
/*!
- \qmlproperty url QtQuick2::Text::baseUrl
+ \qmlproperty url QtQuick::Text::baseUrl
This property specifies a base URL which is used to resolve relative URLs
within the text.
@@ -2291,7 +2291,7 @@ void QQuickText::updatePolish()
}
/*!
- \qmlproperty real QtQuick2::Text::contentWidth
+ \qmlproperty real QtQuick::Text::contentWidth
Returns the width of the text, including width past the width
which is covered due to insufficient wrapping if WrapMode is set.
@@ -2303,7 +2303,7 @@ qreal QQuickText::contentWidth() const
}
/*!
- \qmlproperty real QtQuick2::Text::contentHeight
+ \qmlproperty real QtQuick::Text::contentHeight
Returns the height of the text, including height past the height
which is covered due to there being more text than fits in the set height.
@@ -2315,7 +2315,7 @@ qreal QQuickText::contentHeight() const
}
/*!
- \qmlproperty real QtQuick2::Text::lineHeight
+ \qmlproperty real QtQuick::Text::lineHeight
Sets the line height for the text.
The value can be in pixels or a multiplier depending on lineHeightMode.
@@ -2343,7 +2343,7 @@ void QQuickText::setLineHeight(qreal lineHeight)
}
/*!
- \qmlproperty enumeration QtQuick2::Text::lineHeightMode
+ \qmlproperty enumeration QtQuick::Text::lineHeightMode
This property determines how the line height is specified.
The possible values are:
@@ -2374,7 +2374,7 @@ void QQuickText::setLineHeightMode(LineHeightMode mode)
}
/*!
- \qmlproperty enumeration QtQuick2::Text::fontSizeMode
+ \qmlproperty enumeration QtQuick::Text::fontSizeMode
This property specifies how the font size of the displayed text is determined.
The possible values are:
@@ -2417,7 +2417,7 @@ void QQuickText::setFontSizeMode(FontSizeMode mode)
}
/*!
- \qmlproperty int QtQuick2::Text::minimumPixelSize
+ \qmlproperty int QtQuick::Text::minimumPixelSize
This property specifies the minimum font pixel size of text scaled by the
fontSizeMode property.
@@ -2445,7 +2445,7 @@ void QQuickText::setMinimumPixelSize(int size)
}
/*!
- \qmlproperty int QtQuick2::Text::minimumPointSize
+ \qmlproperty int QtQuick::Text::minimumPointSize
This property specifies the minimum font point \l size of text scaled by
the fontSizeMode property.
@@ -2593,7 +2593,7 @@ bool QQuickTextPrivate::isLinkHoveredConnected()
}
/*!
- \qmlsignal QtQuick2::Text::onLinkHovered(string link)
+ \qmlsignal QtQuick::Text::onLinkHovered(string link)
\since 5.2
This handler is called when the user hovers a link embedded in the
@@ -2604,7 +2604,7 @@ bool QQuickTextPrivate::isLinkHoveredConnected()
*/
/*!
- \qmlproperty string QtQuick2::Text::hoveredLink
+ \qmlproperty string QtQuick::Text::hoveredLink
\since 5.2
This property contains the link string when user hovers a link