summaryrefslogtreecommitdiffstats
path: root/examples/declarative
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-17 08:19:13 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-17 08:19:13 (GMT)
commit39dcbf66fd482bc49a475ec056f90e8a123cd4a8 (patch)
tree6866d77d715332b9be33c7028c6ecce0d749604d /examples/declarative
parente969212de0b2ac816a46db8897d54e9ed78d57b8 (diff)
parent5372b313127302d94c748732052dd62d0e38a1cd (diff)
downloadQt-39dcbf66fd482bc49a475ec056f90e8a123cd4a8.zip
Qt-39dcbf66fd482bc49a475ec056f90e8a123cd4a8.tar.gz
Qt-39dcbf66fd482bc49a475ec056f90e8a123cd4a8.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/declarative')
-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)