diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 15:45:07 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-11 15:45:07 (GMT) |
commit | b02508a00d82dd2a4bd097af22861dcdef14adea (patch) | |
tree | 96e26fcf6ce4bb3930ca0425107a43a5f829fa68 /tests/auto/declarative/qmllanguage/data/idProperty.qml | |
parent | 163b383404f25f5e951959a8d5056124567ef183 (diff) | |
parent | 1c2d8e41377644df27ac0ef5cdeeecb79598661c (diff) | |
download | Qt-b02508a00d82dd2a4bd097af22861dcdef14adea.zip Qt-b02508a00d82dd2a4bd097af22861dcdef14adea.tar.gz Qt-b02508a00d82dd2a4bd097af22861dcdef14adea.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3398 commits)
Fixed compile of these recently renamed tests.
Update QmlChanges.txt
Adds qml prefix to all declarative autotests
Removed "running: true" for animations used as propertyvaluesource
Animations are running by default when used as property source value
Fix QmlEngine offlineStoragePath test.
Fix Image test on Windows.
Fix FontLoader test on Windows.
Test should use ceil() not floor() since ceil() is used for calculating
Fix BorderImage tests on Windows.
Test should use ceil() not floor() since ceil() is used for calculating
Clean up
Must pass app arguments onto qExec() or else test system cannot
QML Object toString should use 64-bit address on 64-bit platforms
Improve stability of tst_qmlecmascript::dynamicDestruction
Fix tst_qmlecmascript::callQtInvokables
Fixed qmldebug* tests crashing.
Fix declarative/qmldom::loadDynamicProperty autotest
Fix declarative/animatedimage autotest
Removed the tests/auto/declarative/visual(&examples) from .pro
...
Diffstat (limited to 'tests/auto/declarative/qmllanguage/data/idProperty.qml')
-rw-r--r-- | tests/auto/declarative/qmllanguage/data/idProperty.qml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmllanguage/data/idProperty.qml b/tests/auto/declarative/qmllanguage/data/idProperty.qml new file mode 100644 index 0000000..90c1483 --- /dev/null +++ b/tests/auto/declarative/qmllanguage/data/idProperty.qml @@ -0,0 +1,8 @@ +import Test 1.0 +MyContainer { + property var object : myObjectId + + MyTypeObject { + id: "myObjectId" + } +} |