diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-07 22:00:16 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-07 22:00:16 (GMT) |
| commit | 8130fcbffe365c0e019f45baae7f1b273d8e17e7 (patch) | |
| tree | 91cebf29af4336d2010fe66460d586f605a72ab0 /demos/declarative/flickr/flickr.qml | |
| parent | 0f9d642e105da1644f4ed846a696510f9a9f1daf (diff) | |
| parent | 161f15e1e79ec5f23244da68340ba1e78f3ac4bb (diff) | |
| download | Qt-8130fcbffe365c0e019f45baae7f1b273d8e17e7.zip Qt-8130fcbffe365c0e019f45baae7f1b273d8e17e7.tar.gz Qt-8130fcbffe365c0e019f45baae7f1b273d8e17e7.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'demos/declarative/flickr/flickr.qml')
| -rw-r--r-- | demos/declarative/flickr/flickr.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml index 1533c04..740ee35 100644 --- a/demos/declarative/flickr/flickr.qml +++ b/demos/declarative/flickr/flickr.qml @@ -109,7 +109,7 @@ Item { states: State { name: "DetailedView" PropertyChanges { target: views; x: -parent.width } - PropertyChanges { target: toolBar; button1Label: "More..." } + PropertyChanges { target: toolBar; button1Label: "View..." } PropertyChanges { target: toolBar onButton1Clicked: if (imageDetails.state=='') imageDetails.state='Back'; else imageDetails.state='' |