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 /tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml | |
| 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 'tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml b/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml index 90c1483..bf048ea 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/idProperty.qml @@ -1,6 +1,6 @@ import Test 1.0 MyContainer { - property var object : myObjectId + property variant object : myObjectId MyTypeObject { id: "myObjectId" |