diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 07:04:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 07:04:08 (GMT) |
| commit | 946c129376058ba1b02349df833498a5cab418a4 (patch) | |
| tree | e7cecf5d047cc2324ca9f511a53004a9953e9b62 /demos/declarative/snake | |
| parent | 065f26ef3996368ba67ff5d8e34b20106c359a95 (diff) | |
| parent | 406f5c86bdfa950e94602c03f9dda14c1d51d297 (diff) | |
| download | Qt-946c129376058ba1b02349df833498a5cab418a4.zip Qt-946c129376058ba1b02349df833498a5cab418a4.tar.gz Qt-946c129376058ba1b02349df833498a5cab418a4.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: (86 commits)
Small fixes to photoviewer demo
Fix benchmark.
Add basic QUrl benchmarks.
Add busy indicator to photoviewer demo
Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRange
fix installation of imports libraries
QDeclarative::isWritable optimization.
Make easing docs more consistent with other grouped property docs.
Make the loader a focusscope.
Fix typo.
Use reliable local server for HTTP testing.
Fix installation of imports libraries
Change PathView offset property to use range 0 - 1.0
Tweak benchmark
Optimization: Use linked list for context children
Add new declarative photoviewer demo
Remove dead code
Make QML the object allocator more flexible
Fix crash on 32-bit platforms
Enable GL samplebuffers by default on Mac OS X
...
Diffstat (limited to 'demos/declarative/snake')
| -rw-r--r-- | demos/declarative/snake/content/Cookie.qml | 1 | ||||
| -rw-r--r-- | demos/declarative/snake/content/Link.qml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/demos/declarative/snake/content/Cookie.qml b/demos/declarative/snake/content/Cookie.qml index 0ea95cb..b64987e 100644 --- a/demos/declarative/snake/content/Cookie.qml +++ b/demos/declarative/snake/content/Cookie.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import Qt.labs.particles 1.0 Item { id: root diff --git a/demos/declarative/snake/content/Link.qml b/demos/declarative/snake/content/Link.qml index 31ac4b9..4171247 100644 --- a/demos/declarative/snake/content/Link.qml +++ b/demos/declarative/snake/content/Link.qml @@ -1,4 +1,5 @@ import Qt 4.6 +import Qt.labs.particles 1.0 Item { id:link property bool dying: false |