diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-07-29 03:58:58 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-07-29 03:58:58 (GMT) |
| commit | 34c4380219743a3b268bf1ce0be55d7291da5750 (patch) | |
| tree | 18058547e344811f7260e50b95771e97a132c1ef /demos | |
| parent | cd813f93530512ffcedef6376e8c9266162c8714 (diff) | |
| parent | d1e1f49ea0b742fd655112fdb30f5751e142a766 (diff) | |
| download | Qt-34c4380219743a3b268bf1ce0be55d7291da5750.zip Qt-34c4380219743a3b268bf1ce0be55d7291da5750.tar.gz Qt-34c4380219743a3b268bf1ce0be55d7291da5750.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/photoviewer/PhotoViewerCore/Button.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/snake/content/Link.qml | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/Button.qml b/demos/declarative/photoviewer/PhotoViewerCore/Button.qml index a60d5ca..47b90c8 100644 --- a/demos/declarative/photoviewer/PhotoViewerCore/Button.qml +++ b/demos/declarative/photoviewer/PhotoViewerCore/Button.qml @@ -45,7 +45,7 @@ Item { id: container property alias label: labelText.text - property string tint: "" + property color tint: "transparent" signal clicked width: labelText.width + 70 ; height: labelText.height + 18 diff --git a/demos/declarative/snake/content/Link.qml b/demos/declarative/snake/content/Link.qml index f4d7165..9aa6006 100644 --- a/demos/declarative/snake/content/Link.qml +++ b/demos/declarative/snake/content/Link.qml @@ -73,14 +73,12 @@ Item { id:link } } - /* transform: Rotation { id: actualImageRotation origin.x: width/2; origin.y: height/2; angle: rotation * 90 Behavior on angle { NumberAnimation { duration: spawned ? 200 : 0} } } - */ } Image { |