diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-26 06:03:10 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-26 06:03:10 (GMT) |
| commit | fe9dcaabe564c922696c9dcdad65fc56181e0d44 (patch) | |
| tree | e10f12aaf406cfa14333005e8492753274b7818e /examples/declarative/imageelements/image | |
| parent | dac9c7f42765a46d445aae35fd0e85b402ceb164 (diff) | |
| parent | 441c9ebdebb17cd31c39a615e82a3ea26f101465 (diff) | |
| download | Qt-fe9dcaabe564c922696c9dcdad65fc56181e0d44.zip Qt-fe9dcaabe564c922696c9dcdad65fc56181e0d44.tar.gz Qt-fe9dcaabe564c922696c9dcdad65fc56181e0d44.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'examples/declarative/imageelements/image')
| -rw-r--r-- | examples/declarative/imageelements/image/ImageCell.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/imageelements/image/face-smile.png | bin | 15408 -> 0 bytes | |||
| -rw-r--r-- | examples/declarative/imageelements/image/qt-logo.png | bin | 0 -> 5149 bytes |
3 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/imageelements/image/ImageCell.qml b/examples/declarative/imageelements/image/ImageCell.qml index bd232b9..71a17fe 100644 --- a/examples/declarative/imageelements/image/ImageCell.qml +++ b/examples/declarative/imageelements/image/ImageCell.qml @@ -48,7 +48,7 @@ Item { Image { id: image width: parent.width; height: parent.height - captionItem.height - source: "face-smile.png" + source: "qt-logo.png" clip: true // only makes a difference if mode is PreserveAspectCrop smooth: true } diff --git a/examples/declarative/imageelements/image/face-smile.png b/examples/declarative/imageelements/image/face-smile.png Binary files differdeleted file mode 100644 index 3d66d72..0000000 --- a/examples/declarative/imageelements/image/face-smile.png +++ /dev/null diff --git a/examples/declarative/imageelements/image/qt-logo.png b/examples/declarative/imageelements/image/qt-logo.png Binary files differnew file mode 100644 index 0000000..14ddf2a --- /dev/null +++ b/examples/declarative/imageelements/image/qt-logo.png |
