diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-05-07 07:12:21 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-05-07 07:12:21 (GMT) |
| commit | 2d76308b923717e613a499894440185fa618b5e7 (patch) | |
| tree | 4098c1d75855127a1a36d6f65ca9b00d7cc12f02 /demos | |
| parent | 56b9afeb8547b724e0e061b1c7bbf8fb62874567 (diff) | |
| parent | 84dc4e1c5c48d38b4a59fab22e49162de091beff (diff) | |
| download | Qt-2d76308b923717e613a499894440185fa618b5e7.zip Qt-2d76308b923717e613a499894440185fa618b5e7.tar.gz Qt-2d76308b923717e613a499894440185fa618b5e7.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/flickr/content/ImageDetails.qml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml index 955f85d..6c354f6 100644 --- a/demos/declarative/flickr/content/ImageDetails.qml +++ b/demos/declarative/flickr/content/ImageDetails.qml @@ -60,8 +60,9 @@ Flipable { text: "<b>Published:</b> " + Container.photoDate } Text { id: TagsLabel; color: "white"; x: 220; anchors.top: Date.bottom; text: Container.photoTags == "" ? "" : "<b>Tags:</b> " } - Text { id: Tags; color: "white"; width: parent.width-x-20; anchors.left: TagsLabel.right; anchors.top: Date.bottom; elide: "ElideRight" - text: Container.photoTags == "" ? "" : Container.photoTags } + Text { id: Tags; color: "white"; width: parent.width-x-20; + anchors.left: TagsLabel.right; anchors.top: Date.bottom; + elide: "ElideRight"; text: Container.photoTags } ScrollBar { id: ScrollBar; x: 720; y: Flickable.y; width: 7; height: Flickable.height; opacity: 0; flickableArea: Flickable; clip: true } |