aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-08-01 14:03:49 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-02 05:44:53 +0200
commit76c5bbd375fb41ab2a2226026b810f062614f687 (patch)
tree6125fc7bb5544f2d54a6e884f996843027065d64 /src
parent7b75e27e485bacf48bdead1e404144410879e987 (diff)
Use \b instead of \bold
Change-Id: Ica77b78b113321f962066f1edabd34bf21d38910 Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/qml/doc/src/cppintegration/definetypes.qdoc2
-rw-r--r--src/qml/doc/src/cppintegration/exposecppattributes.qdoc4
-rw-r--r--src/qml/doc/src/syntax/objectattributes.qdoc6
-rw-r--r--src/qml/doc/src/typesystem/basictypes.qdoc6
-rw-r--r--src/quick/items/qquickgridview.cpp20
-rw-r--r--src/quick/items/qquicklistview.cpp4
6 files changed, 21 insertions, 21 deletions
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc
index 36105e9ba2..140ab6a197 100644
--- a/src/qml/doc/src/cppintegration/definetypes.qdoc
+++ b/src/qml/doc/src/cppintegration/definetypes.qdoc
@@ -66,7 +66,7 @@ exposed to QML but the type itself should not be instantiable.
\section2 Registering an Instantiable Object Type
-\bold{Any QObject-derived C++ class can be registered as the definition of a
+\b{Any QObject-derived C++ class can be registered as the definition of a
\l{qtqml-typesystem-objecttypes.html}{QML object type}}. Once a
class is registered with the QML type system, the class can be declared and
instantiated like any other object type from QML code. Once created, a
diff --git a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
index 6d8718ea2e..f4bdb92949 100644
--- a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
+++ b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
@@ -125,7 +125,7 @@ Text {
}
\endqml
-For maximum interopability with QML, \bold {any property that is writable should
+For maximum interopability with QML, \b {any property that is writable should
have an associated NOTIFY signal} that is emitted whenever the property value
has changed. This allows the property to be used with \l{Property
Binding}{property binding}, which is an essential feature of QML that enables
@@ -503,4 +503,4 @@ Furthermore, the QML engine respects the normal QObject parent ownership
semantics of Qt C++ objects, and will not ever take ownership of a QObject
instance which already has a parent.
-*/ \ No newline at end of file
+*/
diff --git a/src/qml/doc/src/syntax/objectattributes.qdoc b/src/qml/doc/src/syntax/objectattributes.qdoc
index fa84b79c04..941d3c6198 100644
--- a/src/qml/doc/src/syntax/objectattributes.qdoc
+++ b/src/qml/doc/src/syntax/objectattributes.qdoc
@@ -91,7 +91,7 @@ information.
Once an object instance is created, the value of its \e id attribute cannot
be changed. While it may look like an ordinary property, the \c id attribute
-is \bold{not} an ordinary \c property attribute, and special semantics apply
+is \b{not} an ordinary \c property attribute, and special semantics apply
to it; for example, it is not possible to access \c myTextInput.id in the above
example.
@@ -423,12 +423,12 @@ while the second uses group notation:
Text {
//dot notation
font.pixelSize: 12
- font.bold: true
+ font.b: true
}
Text {
//group notation
- font { pixelSize: 12; bold: true }
+ font { pixelSize: 12; b: true }
}
\endcode
diff --git a/src/qml/doc/src/typesystem/basictypes.qdoc b/src/qml/doc/src/typesystem/basictypes.qdoc
index 0f66112b3c..939c67a50c 100644
--- a/src/qml/doc/src/typesystem/basictypes.qdoc
+++ b/src/qml/doc/src/typesystem/basictypes.qdoc
@@ -78,7 +78,7 @@ must import that module in their QML documents.
\section1 Property Change Behavior for Basic Types
Some basic types have properties: for example, the \l font type has
-\c pixelSize, \c family and \c bold properties. Unlike properties of
+\c pixelSize, \c family and \c b properties. Unlike properties of
\l{qtqml-typesystem-topic.html#qml-object-types}{object types}, properties of
basic types do not provide their own property change signals. It is only possible
to create a property change signal handler for the basic type property itself:
@@ -113,7 +113,7 @@ Text {
// changing any of the font attributes, or reassigning the property
// to a different font value, will invoke the onFontChanged handler
Keys.onDigit1Pressed: font.pixelSize += 1
- Keys.onDigit2Pressed: font.bold = !font.bold
+ Keys.onDigit2Pressed: font.b = !font.b
Keys.onDigit3Pressed: font = otherText.font
}
\endqml
@@ -259,7 +259,7 @@ property is only invoked when the property is reassigned to a different object v
\section1 Using the url Type
When a relative URL is written to a \c url type property, it is converted
- into a URL object, so \bold {matching the URL value against the input string
+ into a URL object, so \b {matching the URL value against the input string
value will fail}. Instead, convert the string to a URL using Qt.resolvedUrl()
for means of comparison, and use \c toString() to get the contents of the URL:
diff --git a/src/quick/items/qquickgridview.cpp b/src/quick/items/qquickgridview.cpp
index f60e3f3a5c..b5623800fd 100644
--- a/src/quick/items/qquickgridview.cpp
+++ b/src/quick/items/qquickgridview.cpp
@@ -1233,27 +1233,27 @@ bool QQuickGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
\table
\header
\li {4, 1}
- \bold GridViews with GridView.LeftToRight flow
+ \b GridViews with GridView.LeftToRight flow
\row
- \li \bold (H) Left to right \bold (V) Top to bottom
+ \li \b (H) Left to right \b (V) Top to bottom
\image gridview-layout-lefttoright-ltr-ttb.png
- \li \bold (H) Right to left \bold (V) Top to bottom
+ \li \b (H) Right to left \b (V) Top to bottom
\image gridview-layout-lefttoright-rtl-ttb.png
- \li \bold (H) Left to right \bold (V) Bottom to top
+ \li \b (H) Left to right \b (V) Bottom to top
\image gridview-layout-lefttoright-ltr-btt.png
- \li \bold (H) Right to left \bold (V) Bottom to top
+ \li \b (H) Right to left \b (V) Bottom to top
\image gridview-layout-lefttoright-rtl-btt.png
\header
\li {4, 1}
- \bold GridViews with GridView.TopToBottom flow
+ \b GridViews with GridView.TopToBottom flow
\row
- \li \bold (H) Left to right \bold (V) Top to bottom
+ \li \b (H) Left to right \b (V) Top to bottom
\image gridview-layout-toptobottom-ltr-ttb.png
- \li \bold (H) Right to left \bold (V) Top to bottom
+ \li \b (H) Right to left \b (V) Top to bottom
\image gridview-layout-toptobottom-rtl-ttb.png
- \li \bold (H) Left to right \bold (V) Bottom to top
+ \li \b (H) Left to right \b (V) Bottom to top
\image gridview-layout-toptobottom-ltr-btt.png
- \li \bold (H) Right to left \bold (V) Bottom to top
+ \li \b (H) Right to left \b (V) Bottom to top
\image gridview-layout-toptobottom-rtl-btt.png
\endtable
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index f4f6efee19..818f045188 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -1731,7 +1731,7 @@ bool QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
\table
\header
\li {2, 1}
- \bold ListViews with Qt.Vertical orientation
+ \b ListViews with Qt.Vertical orientation
\row
\li Top to bottom
\image listview-layout-toptobottom.png
@@ -1739,7 +1739,7 @@ bool QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
\image listview-layout-bottomtotop.png
\header
\li {2, 1}
- \bold ListViews with Qt.Horizontal orientation
+ \b ListViews with Qt.Horizontal orientation
\row
\li Left to right
\image listview-layout-lefttoright.png