diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-08-20 06:31:19 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-08-20 06:31:19 (GMT) |
| commit | 7e5db00742c94ae9780231a6cec36a827122fd7f (patch) | |
| tree | 515f1e7c53981d6d0ed76d901253e8e661d2b957 /doc/src | |
| parent | d4972961949da2ab9f17962f6fb2ec61f7be7ad3 (diff) | |
| parent | f3ed6a6156c49ae6e17cd259e6e9b0bc1100f280 (diff) | |
| download | Qt-7e5db00742c94ae9780231a6cec36a827122fd7f.zip Qt-7e5db00742c94ae9780231a6cec36a827122fd7f.tar.gz Qt-7e5db00742c94ae9780231a6cec36a827122fd7f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/snippets/declarative/comments.qml | 2 | ||||
| -rw-r--r-- | doc/src/snippets/declarative/pathview/pathattributes.qml | 2 | ||||
| -rw-r--r-- | doc/src/snippets/declarative/pathview/pathview.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/snippets/declarative/comments.qml b/doc/src/snippets/declarative/comments.qml index 4f8a442..806be29 100644 --- a/doc/src/snippets/declarative/comments.qml +++ b/doc/src/snippets/declarative/comments.qml @@ -7,5 +7,5 @@ Text { we give it a large size and different font. */ font.family: "Helvetica" - font.size: 24 + font.pointSize: 24 } diff --git a/doc/src/snippets/declarative/pathview/pathattributes.qml b/doc/src/snippets/declarative/pathview/pathattributes.qml index 3c2b204..92d6966 100644 --- a/doc/src/snippets/declarative/pathview/pathattributes.qml +++ b/doc/src/snippets/declarative/pathview/pathattributes.qml @@ -13,7 +13,7 @@ Rectangle { opacity: PathView.opacity VerticalLayout { Image { anchors.horizontalCenter: Name.horizontalCenter; width: 64; height: 64; source: icon } - Text { id: Name; text: name; font.size: 16} + Text { id: Name; text: name; font.pointSize: 16} } } } diff --git a/doc/src/snippets/declarative/pathview/pathview.qml b/doc/src/snippets/declarative/pathview/pathview.qml index f5db242..004a1d2 100644 --- a/doc/src/snippets/declarative/pathview/pathview.qml +++ b/doc/src/snippets/declarative/pathview/pathview.qml @@ -11,7 +11,7 @@ Rectangle { width: 80; height: 80 VerticalLayout { Image { anchors.horizontalCenter: Name.horizontalCenter; width: 64; height: 64; source: icon } - Text { id: Name; text: name; font.size: 16} + Text { id: Name; text: name; font.pointSize: 16} } } } |