diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 02:24:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-13 02:24:13 (GMT) |
| commit | 3e94b3a77affeef80544e48949e018ced4e0d96e (patch) | |
| tree | 621251f4fd85ced80d80e15f8d120e90bc095585 /examples/declarative/animations | |
| parent | e9a0067ef4b272f1893522959dc15561970590ea (diff) | |
| parent | ff0020481398e7c109973949260a42711c4cdcdc (diff) | |
| download | Qt-3e94b3a77affeef80544e48949e018ced4e0d96e.zip Qt-3e94b3a77affeef80544e48949e018ced4e0d96e.tar.gz Qt-3e94b3a77affeef80544e48949e018ced4e0d96e.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: (147 commits)
doc fixes
Don't test XmlListModel examples on platforms without QtXmlPatterns
More error output for QML_IMPORT_TRACE=1
Fix declarative examples autotest, avoid using native separators
Doc: update Rectangle smooth painting screenshot.
Add some TextInput properties and methods
Remove GraphicsObjectContainer from the documentation.
import Qt 4.6 -> import Qt 4.7
Move documentation code to snippet.
Test fix.
Fix test
Fix test on QWS.
Fix PathView crash.
Make bindings dump more useful
Improve font value type documentation.
coding conventions
Doc fixes
Warning
Read Maemo orientation at startup
Exclude gestures from examples autotest
...
Diffstat (limited to 'examples/declarative/animations')
| -rw-r--r-- | examples/declarative/animations/color-animation.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/animations/easing.qml | 2 | ||||
| -rw-r--r-- | examples/declarative/animations/property-animation.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/declarative/animations/color-animation.qml b/examples/declarative/animations/color-animation.qml index d8361ba..3616a31 100644 --- a/examples/declarative/animations/color-animation.qml +++ b/examples/declarative/animations/color-animation.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 import Qt.labs.particles 1.0 Item { diff --git a/examples/declarative/animations/easing.qml b/examples/declarative/animations/easing.qml index 8f2655e..bed4b5f9 100644 --- a/examples/declarative/animations/easing.qml +++ b/examples/declarative/animations/easing.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 Rectangle { id: window diff --git a/examples/declarative/animations/property-animation.qml b/examples/declarative/animations/property-animation.qml index fd5eb3c..5afe8ef 100644 --- a/examples/declarative/animations/property-animation.qml +++ b/examples/declarative/animations/property-animation.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 Item { id: window |