diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 08:06:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 08:06:40 (GMT) |
| commit | 0b6fd8966972616232054c5194243c52ca360bf8 (patch) | |
| tree | 06dc40958aefc6f5e118dccfa192ff77528a014d /tests/auto/declarative/qdeclarativestates/data/parentChange3.qml | |
| parent | 1c47be7174ca1e9ed393a12461742975079710d7 (diff) | |
| parent | e9da512e321c6ea7795a4abc0b9d24bf4d3d2527 (diff) | |
| download | Qt-0b6fd8966972616232054c5194243c52ca360bf8.zip Qt-0b6fd8966972616232054c5194243c52ca360bf8.tar.gz Qt-0b6fd8966972616232054c5194243c52ca360bf8.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: (135 commits)
Do not treat images in qml examples differently.
Replace Flickable overshoot property with boundsBehavior
Autotests and doc
Give error on attempt to import types from too-early version number.
Remove (undocumented) QML bindings for effects.
De-straighten them lines.
Doc: fix QStringList model doc (really).
Doc: fix QStringList model docs
Change return type to match value().
Add duration and easing properties to AnchorAnimation.
Autotest
Remove dead code
Compile on Windows (export decl fix).
Fix versioning of Qt Declarative's in-built types
Fixed declarative/parserstress autotest.
Fix parsing of regular expression literals.
Fill out QGraphicsLayout bindings
Update test files to new syntax
Compile without Qt3 support.
Ensure workerscript.qml works (autotested).
...
Diffstat (limited to 'tests/auto/declarative/qdeclarativestates/data/parentChange3.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativestates/data/parentChange3.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml b/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml index ddf9268..17c07e8 100644 --- a/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml +++ b/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 Rectangle { width: 400; height: 400 |