summaryrefslogtreecommitdiffstats
path: root/examples/declarative/parallax/parallax.qml
diff options
context:
space:
mode:
authorMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-05-12 15:01:55 (GMT)
committerMorten Engvoldsen <morten.engvoldsen@nokia.com>2010-05-12 15:01:55 (GMT)
commitd41ccae68683dd0d35c20affec7e5c55ce6bca37 (patch)
tree270fe804f2b130243da4e714cc1a135690bc466d /examples/declarative/parallax/parallax.qml
parent5987412720498aa22202a1bcca3cb988a9cf5606 (diff)
parent41cbfc5c8e6644ab21e92860db95b2e8da9aba6a (diff)
downloadQt-d41ccae68683dd0d35c20affec7e5c55ce6bca37.zip
Qt-d41ccae68683dd0d35c20affec7e5c55ce6bca37.tar.gz
Qt-d41ccae68683dd0d35c20affec7e5c55ce6bca37.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'examples/declarative/parallax/parallax.qml')
-rw-r--r--examples/declarative/parallax/parallax.qml2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/declarative/parallax/parallax.qml b/examples/declarative/parallax/parallax.qml
index cb0437d..ca00176 100644
--- a/examples/declarative/parallax/parallax.qml
+++ b/examples/declarative/parallax/parallax.qml
@@ -31,7 +31,7 @@ Rectangle {
Loader {
anchors { top: parent.top; topMargin: 10; horizontalCenter: parent.horizontalCenter }
width: 300; height: 400
- clip: true; resizeMode: Loader.SizeItemToLoader
+ clip: true;
source: "../../../demos/declarative/samegame/samegame.qml"
}
}