diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-08-25 04:35:24 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-08-25 04:35:24 (GMT) |
| commit | 8d5bd63dcbfc610128166f6d277680c9385aa665 (patch) | |
| tree | 2a28b465ff3f524aa3e7e6b5d75b90f6275fdf05 | |
| parent | 29b028b156b190718ecdb223c08f2fdcfc07b3e6 (diff) | |
| parent | d6f0db181ab35250ee53c9b9d0210a80c69382ac (diff) | |
| download | Qt-8d5bd63dcbfc610128166f6d277680c9385aa665.zip Qt-8d5bd63dcbfc610128166f6d277680c9385aa665.tar.gz Qt-8d5bd63dcbfc610128166f6d277680c9385aa665.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | demos/declarative/samegame/SameGame.qml | 6 | ||||
| -rw-r--r-- | demos/declarative/samegame/content/Dialog.qml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/demos/declarative/samegame/SameGame.qml b/demos/declarative/samegame/SameGame.qml index 37ccff7..0da5679 100644 --- a/demos/declarative/samegame/SameGame.qml +++ b/demos/declarative/samegame/SameGame.qml @@ -3,7 +3,7 @@ import "content" Rectangle { id: Screen - width: 460; height: 700 + width: 490; height: 720 Script { source: "content/samegame.js" } @@ -23,8 +23,8 @@ Rectangle { property int score: 0 z: 20; anchors.centerIn: parent - width: parent.width - tileSize - (parent.width % tileSize); - height: parent.height - tileSize - (parent.height % tileSize); + width: parent.width - (parent.width % tileSize); + height: parent.height - (parent.height % tileSize); MouseRegion { id: gameMR diff --git a/demos/declarative/samegame/content/Dialog.qml b/demos/declarative/samegame/content/Dialog.qml index a3c5f33..72c7900 100644 --- a/demos/declarative/samegame/content/Dialog.qml +++ b/demos/declarative/samegame/content/Dialog.qml @@ -2,7 +2,7 @@ import Qt 4.6 Rectangle { id: page - color: "white"; border.width: 1; width: 200; height: 60; + color: "white"; border.width: 1; width: MyText.width + 20; height: 60; property string text: "Hello World!" opacity: 0 opacity: Behavior { @@ -11,5 +11,5 @@ Rectangle { NumberAnimation {property: "opacity"; to: 0; duration: 1500 } } } - Text { anchors.centerIn: parent; text: parent.text } + Text { id: MyText; anchors.centerIn: parent; text: parent.text } } |