diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 03:29:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 03:29:05 (GMT) |
| commit | 5ea1f7d58ad19a2917308050b5bf42fd310b4a5c (patch) | |
| tree | 4423fa190eb7e40fb5a10a2d91fa0f27a901aab7 /tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml | |
| parent | ef06a357aaeb83768d9170859bd99f0ceaf7e82b (diff) | |
| parent | e6b5d2a4df73aa26812e26daa3199443bd84cc90 (diff) | |
| download | Qt-5ea1f7d58ad19a2917308050b5bf42fd310b4a5c.zip Qt-5ea1f7d58ad19a2917308050b5bf42fd310b4a5c.tar.gz Qt-5ea1f7d58ad19a2917308050b5bf42fd310b4a5c.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: (131 commits)
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.
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).
Update strings in test
remove debugs
Make the dynamic creation functions on the Qt object
More focus example cleanup.
...
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml index a9a57eb..4ceff3d 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 QtObject { property QtObject object |