summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-17 13:32:20 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-17 13:32:20 (GMT)
commit2046037499830506ec24097c9b7a739bb7c78566 (patch)
tree1af518306ce87b7fb1fc7803a4d6d2f663b2506c /examples
parentcb3b83e64154e9725c0c050ea32a4a632ad9f041 (diff)
parent39dcbf66fd482bc49a475ec056f90e8a123cd4a8 (diff)
downloadQt-2046037499830506ec24097c9b7a739bb7c78566.zip
Qt-2046037499830506ec24097c9b7a739bb7c78566.tar.gz
Qt-2046037499830506ec24097c9b7a739bb7c78566.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 example after changes to font.letterSpacing. Autotest and small fix for QDeclarativeFontLoader. Improve error messages Changes to objects returned from get() should emit itemsChanged() so Make it clear that private ListModel constructor is only for worker Remove duplicated move() implementations Doc changes Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the query has already quit PathView didn't accept mouse events, preventing it from working in a Flickable. Moving items in a PathView caused PathView.onPath to be set to false. Fix worker agent to emit ListModel itemsChanged() correctly when set()
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/text/fonts/hello.qml3
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/declarative/text/fonts/hello.qml b/examples/declarative/text/fonts/hello.qml
index a396ff3..60bd919 100644
--- a/examples/declarative/text/fonts/hello.qml
+++ b/examples/declarative/text/fonts/hello.qml
@@ -56,10 +56,11 @@ Rectangle {
color: "white"
text: "Hello world!"
font.pixelSize: 60
+ smooth: true
SequentialAnimation on font.letterSpacing {
loops: Animation.Infinite;
- NumberAnimation { from: 100; to: 300; easing.type: Easing.InQuad; duration: 3000 }
+ NumberAnimation { from: 0; to: 150; easing.type: Easing.InQuad; duration: 3000 }
ScriptAction {
script: {
container.y = (screen.height / 4) + (Math.random() * screen.height / 2)