diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-03-11 08:21:15 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-03-11 08:21:15 (GMT) |
| commit | 327c36acdba0422e93d99dc71cb3f5238d326977 (patch) | |
| tree | d85c7b186af9a9324bb4acc5e36d630966876fee /doc/src/snippets/declarative/pathview/pathattributes.qml | |
| parent | b9f8c1491550fe671d1809481ad7f70737034a3b (diff) | |
| parent | 16e8cc808ae7087aadd95855c97d715941711b45 (diff) | |
| download | Qt-327c36acdba0422e93d99dc71cb3f5238d326977.zip Qt-327c36acdba0422e93d99dc71cb3f5238d326977.tar.gz Qt-327c36acdba0422e93d99dc71cb3f5238d326977.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.7-lighthouse
Conflicts:
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/kernel/qwidget.cpp
Diffstat (limited to 'doc/src/snippets/declarative/pathview/pathattributes.qml')
| -rw-r--r-- | doc/src/snippets/declarative/pathview/pathattributes.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/declarative/pathview/pathattributes.qml b/doc/src/snippets/declarative/pathview/pathattributes.qml index 19a192c..99d0de2 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 Column { Image { anchors.horizontalCenter: name.horizontalCenter; width: 64; height: 64; source: icon } - Text { id: name; text: name; font.pointSize: 16} + Text { text: name; font.pointSize: 16} } } } |