diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-29 05:46:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-29 05:46:52 (GMT) |
| commit | 60d37c9c2f99ee1b10293c4dbc0264664dd8cad0 (patch) | |
| tree | 0927df98b56de254d784dc2efe6c722607b36dfe /demos | |
| parent | a864e1501f211b400046fe2331aa6fe3c4eb4d18 (diff) | |
| parent | 95ef9a3d7eb851d47dabe3248672ea03e5faa0ce (diff) | |
| download | Qt-60d37c9c2f99ee1b10293c4dbc0264664dd8cad0.zip Qt-60d37c9c2f99ee1b10293c4dbc0264664dd8cad0.tar.gz Qt-60d37c9c2f99ee1b10293c4dbc0264664dd8cad0.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: (28 commits)
Regression: horizontal alignment bug with single line text
Add 'skip' property that QML visual tests can use
Almost all visual tests pass on linux
Disable WebView visualtests
Clean up repeater visual tests
Clean up QML Rect visual tests
Update qdeclarativespringanimation visual tests
Regression: QML fonts look bad on Mac with font smoothing on
Clean up qdeclarativesmoothedanimation visual tests
Clean up qdeclarativepositioner tests
Update visuals for qdeclarativepathview visual tests
Clean up qdeclarativeparticles visual test
Mark qdeclarativegridview autotests as expect-fail
Clean up qdeclarativeflickable visual tests
Clean up qdeclarativeboarderimage visual tests
Add a test for multiline text alignment
Update when text changes to ""
Shrink and update qdeclarativetext visual tests
Clean up package views visual test
Clean up qmlvisual/qdeclarativetextinput visual tests
...
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/declarative/snake/snake.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml index 6eaa976..af86aac 100644 --- a/demos/declarative/snake/snake.qml +++ b/demos/declarative/snake/snake.qml @@ -105,7 +105,7 @@ Rectangle { source: "content/pics/pause.png" anchors.centerIn: parent; //opacity is deliberately not animated - opacity: gameActive && !runtime.isActiveWindow + opacity: activeGame && !runtime.isActiveWindow } Image { |