diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-16 16:21:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-16 16:21:24 (GMT) |
| commit | 7b30a66b2f16a8bf8828d26b7d0b193b5dffe713 (patch) | |
| tree | 3ed1219e02bab53df871e7bf87bcf191c1a7534b /demos | |
| parent | 65b05e330640a5e1920c61a4735cbc27a5ca3fe2 (diff) | |
| parent | 6d178306f71564471cc08eb7dc98743c3752cac4 (diff) | |
| download | Qt-7b30a66b2f16a8bf8828d26b7d0b193b5dffe713.zip Qt-7b30a66b2f16a8bf8828d26b7d0b193b5dffe713.tar.gz Qt-7b30a66b2f16a8bf8828d26b7d0b193b5dffe713.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix the N900 device orientation backend
Micro cleanup
Write TextInput.positionToRectangle docs.
Minor demo fixes
Fix autoScroll implementation
Move knowledge of QGraphicsObject out of qml engine
Stopping a flick resulted in the next click being consumed.
Enhance docs
Slight addition to the docs.
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/samegame/samegame.qml | 2 | ||||
| -rw-r--r-- | demos/declarative/snake/content/Link.qml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml index 9a721da..9c4bfa8 100644 --- a/demos/declarative/samegame/samegame.qml +++ b/demos/declarative/samegame/samegame.qml @@ -115,6 +115,8 @@ Rectangle { id: nameInputText anchors { verticalCenter: parent.verticalCenter; left: dialogText.right } focus: false + autoScroll: false + maximumLength: 24 onTextChanged: { var newWidth = nameInputText.width + dialogText.width + 40; if ( (newWidth > nameInputDialog.width && newWidth < screen.width) diff --git a/demos/declarative/snake/content/Link.qml b/demos/declarative/snake/content/Link.qml index 9aa6006..f4d7165 100644 --- a/demos/declarative/snake/content/Link.qml +++ b/demos/declarative/snake/content/Link.qml @@ -73,12 +73,14 @@ 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 { |