diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-14 02:56:13 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-14 02:56:13 (GMT) |
commit | c7aef9c3a3a9c4b2fcebb9f55ae11fc0b590a9ed (patch) | |
tree | e2618da2b6ce8c4d3ceeecfe66d7fb133068be01 /doc/src/declarative | |
parent | da56f50eb640823e2d48c1308c09626a428a50f5 (diff) | |
download | Qt-c7aef9c3a3a9c4b2fcebb9f55ae11fc0b590a9ed.zip Qt-c7aef9c3a3a9c4b2fcebb9f55ae11fc0b590a9ed.tar.gz Qt-c7aef9c3a3a9c4b2fcebb9f55ae11fc0b590a9ed.tar.bz2 |
Get rid of QmlFont and use the QFont value type instead.
Diffstat (limited to 'doc/src/declarative')
-rw-r--r-- | doc/src/declarative/basictypes.qdoc | 4 | ||||
-rw-r--r-- | doc/src/declarative/qmlforcpp.qdoc | 2 | ||||
-rw-r--r-- | doc/src/declarative/tutorial1.qdoc | 6 | ||||
-rw-r--r-- | doc/src/declarative/tutorial2.qdoc | 2 | ||||
-rw-r--r-- | doc/src/declarative/tutorial3.qdoc | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc index a22af0f..684fd0d 100644 --- a/doc/src/declarative/basictypes.qdoc +++ b/doc/src/declarative/basictypes.qdoc @@ -214,12 +214,12 @@ \o string font.family \o bool font.bold \o bool font.italic - \o real font.size + \o real font.pointSize \endlist Setting a font looks like this: \code - Text { font.family: "Helvetica"; font.size: 13; font.bold: true } + Text { font.family: "Helvetica"; font.pointSize: 13; font.bold: true } \endcode \target basicqmlaction diff --git a/doc/src/declarative/qmlforcpp.qdoc b/doc/src/declarative/qmlforcpp.qdoc index 74357bb..53af252 100644 --- a/doc/src/declarative/qmlforcpp.qdoc +++ b/doc/src/declarative/qmlforcpp.qdoc @@ -161,7 +161,7 @@ \code Text { font.family: "helvetica" - font.size: 12 + font.pointSize: 12 font { bold: true italic: true diff --git a/doc/src/declarative/tutorial1.qdoc b/doc/src/declarative/tutorial1.qdoc index 5c11326..d38dc54 100644 --- a/doc/src/declarative/tutorial1.qdoc +++ b/doc/src/declarative/tutorial1.qdoc @@ -18,7 +18,7 @@ Rect { Text { id: HelloText text: "Hello world!" - font.size: 24 + font.pointSize: 24 font.bold: true y: 30 anchors.horizontalCenter: Page.horizontalCenter @@ -49,7 +49,7 @@ The \l Rect element contains many other properties (such as \c x and \c y), but Text { id: HelloText text: "Hello world!" - font.size: 24 + font.pointSize: 24 font.bold: true y: 30 anchors.horizontalCenter: Page.horizontalCenter @@ -60,7 +60,7 @@ We add a text element as a child of our root element to display the text 'Hello The \c y property is used to position the text vertically at 30 pixels from the top of its parent. -The \c font.size and \c font.bold properties are related to fonts and use the \e 'dot' notation. +The \c font.pointSize and \c font.bold properties are related to fonts and use the \e 'dot' notation. The \c anchors.horizontalCenter property refers to the horizontal center of an element. In this case, we specify that our text element should be horizontally centered in the \e Page element. diff --git a/doc/src/declarative/tutorial2.qdoc b/doc/src/declarative/tutorial2.qdoc index c22a01a..4be0702 100644 --- a/doc/src/declarative/tutorial2.qdoc +++ b/doc/src/declarative/tutorial2.qdoc @@ -41,7 +41,7 @@ Rect { Text { id: HelloText text: "Hello world!" - font.size: 24 + font.pointSize: 24 font.bold: true y: 30 anchors.horizontalCenter: Page.horizontalCenter diff --git a/doc/src/declarative/tutorial3.qdoc b/doc/src/declarative/tutorial3.qdoc index 9ae56c1..0f9dac2 100644 --- a/doc/src/declarative/tutorial3.qdoc +++ b/doc/src/declarative/tutorial3.qdoc @@ -20,7 +20,7 @@ Rect { Text { id: HelloText text: "Hello world!" - font.size: 24 + font.pointSize: 24 font.bold: true y: 30 anchors.horizontalCenter: Page.horizontalCenter |