diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-21 22:06:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-21 22:06:21 (GMT) |
| commit | 445dfc6053c5007591603a722a5689ca165338de (patch) | |
| tree | 7af09c3bad8882787a84c00e7b0d959232baff1b /tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml | |
| parent | 2ca4e77f0a29bc6d7571ca614a6101d9e1bd83e0 (diff) | |
| parent | a29627231a02ebf98645675acbd353618d1109d4 (diff) | |
| download | Qt-445dfc6053c5007591603a722a5689ca165338de.zip Qt-445dfc6053c5007591603a722a5689ca165338de.tar.gz Qt-445dfc6053c5007591603a722a5689ca165338de.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: (122 commits)
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.
Autotests
Add hasModelChildren property to delegates with QAbstractItemModel model type.
Emit released and hoveredChanged in MouseArea when a UngrabMouse is received
Balance grid items for larger displays.
Autotest
Cleanup declarative focus example.
Add forceFocus method to QDeclarativeItem.
Don't allow properties in Component elements
Fix crash when QDeclarativeInfo objects are copied
...
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml b/tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml index 5488e1a..46e18e5 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml @@ -1,4 +1,4 @@ -import Qt 4.6 +import Qt 4.7 QtObject { property bool runTest: false |