diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-03-01 06:05:05 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-03-01 06:05:05 (GMT) |
| commit | fa7053103f4aa528972dc8766c05b5a1371b2bd8 (patch) | |
| tree | f04c0bc684293e17c970ea156ce1827e57b590c6 | |
| parent | 3e8065867d36dd8a562ca4c0c310a9b129ec50e1 (diff) | |
| parent | 5d847f395b65b3e6df3eb71ccc1022077465f05c (diff) | |
| download | Qt-fa7053103f4aa528972dc8766c05b5a1371b2bd8.zip Qt-fa7053103f4aa528972dc8766c05b5a1371b2bd8.tar.gz Qt-fa7053103f4aa528972dc8766c05b5a1371b2bd8.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
| -rw-r--r-- | demos/declarative/flickr/mobile/ImageDetails.qml | 5 | ||||
| -rw-r--r-- | tools/qml/main.cpp | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/demos/declarative/flickr/mobile/ImageDetails.qml b/demos/declarative/flickr/mobile/ImageDetails.qml index 8749b4c..c51371c 100644 --- a/demos/declarative/flickr/mobile/ImageDetails.qml +++ b/demos/declarative/flickr/mobile/ImageDetails.qml @@ -66,10 +66,7 @@ Flipable { Image { id: bigImage; source: container.photoUrl; scale: slider.value - // Center image if it is smaller than the flickable area. - x: imageContainer.width > width*scale ? (imageContainer.width - width*scale) / 2 : 0 - y: imageContainer.height > height*scale ? (imageContainer.height - height*scale) / 2 : 0 - smooth: !flickable.moving + anchors.centerIn: parent; smooth: !flickable.moving onStatusChanged : { // Default scale shows the entire image. if (status == 1 && width != 0) { diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 9ef02ac..6339813 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -324,7 +324,7 @@ int main(int argc, char ** argv) if (!skin.isEmpty()) { if (skin == "list") { foreach (QString s, viewer.builtinSkins()) - qWarning(s.toUtf8()); + qWarning() << qPrintable(s); exit(0); } else { viewer.setSkin(skin); |