summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-02-22 19:22:07 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-02-22 19:22:07 (GMT)
commita7643e04dc89ed9f84ef8f0010ca1f55f9cfd669 (patch)
tree9608bf98e04866ddf1be3b5dbd734f2f738c8914
parent4eb28ae6ca24c19f0187a9da7cb09f3c38349ca4 (diff)
parente194fc49b3902edf6e0f4d13412730a67159b24c (diff)
downloadQt-a7643e04dc89ed9f84ef8f0010ca1f55f9cfd669.zip
Qt-a7643e04dc89ed9f84ef8f0010ca1f55f9cfd669.tar.gz
Qt-a7643e04dc89ed9f84ef8f0010ca1f55f9cfd669.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
-rw-r--r--examples/declarative/aspectratio/face_fit.qml1
-rw-r--r--examples/declarative/aspectratio/face_fit_animated.qml1
-rw-r--r--examples/declarative/aspectratio/scale_and_crop.qml1
-rw-r--r--examples/declarative/aspectratio/scale_and_sidecrop.qml1
-rw-r--r--examples/declarative/aspectratio/scale_to_fit.qml1
5 files changed, 5 insertions, 0 deletions
diff --git a/examples/declarative/aspectratio/face_fit.qml b/examples/declarative/aspectratio/face_fit.qml
index 482d1b7..6a031a4 100644
--- a/examples/declarative/aspectratio/face_fit.qml
+++ b/examples/declarative/aspectratio/face_fit.qml
@@ -16,6 +16,7 @@ Rectangle {
Image {
id: face
smooth: true
+ anchors.centerIn: parent
source: "pics/face.png"
x: (parent.width-width*scale)/2
y: (parent.height-height*scale)/2
diff --git a/examples/declarative/aspectratio/face_fit_animated.qml b/examples/declarative/aspectratio/face_fit_animated.qml
index 80a762b..90ea516 100644
--- a/examples/declarative/aspectratio/face_fit_animated.qml
+++ b/examples/declarative/aspectratio/face_fit_animated.qml
@@ -14,6 +14,7 @@ Rectangle {
Image {
id: face
smooth: true
+ anchors.centerIn: parent
source: "pics/face.png"
x: (parent.width-width*scale)/2
y: (parent.height-height*scale)/2
diff --git a/examples/declarative/aspectratio/scale_and_crop.qml b/examples/declarative/aspectratio/scale_and_crop.qml
index 283e24b..2e2b6ed 100644
--- a/examples/declarative/aspectratio/scale_and_crop.qml
+++ b/examples/declarative/aspectratio/scale_and_crop.qml
@@ -12,6 +12,7 @@ Rectangle {
Image {
id: face
smooth: true
+ anchors.centerIn: parent
source: "pics/face.png"
x: (parent.width-width*scale)/2
y: (parent.height-height*scale)/2
diff --git a/examples/declarative/aspectratio/scale_and_sidecrop.qml b/examples/declarative/aspectratio/scale_and_sidecrop.qml
index c3ef859..8230e49 100644
--- a/examples/declarative/aspectratio/scale_and_sidecrop.qml
+++ b/examples/declarative/aspectratio/scale_and_sidecrop.qml
@@ -13,6 +13,7 @@ Rectangle {
Image {
id: face
smooth: true
+ anchors.centerIn: parent
source: "pics/face.png"
x: (parent.width-width*scale)/2
y: (parent.height-height*scale)/2
diff --git a/examples/declarative/aspectratio/scale_to_fit.qml b/examples/declarative/aspectratio/scale_to_fit.qml
index 961ac04..eae4d16 100644
--- a/examples/declarative/aspectratio/scale_to_fit.qml
+++ b/examples/declarative/aspectratio/scale_to_fit.qml
@@ -13,6 +13,7 @@ Rectangle {
Image {
id: face
smooth: true
+ anchors.centerIn: parent
source: "pics/face.png"
x: (parent.width-width*scale)/2
y: (parent.height-height*scale)/2