diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 08:50:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 08:50:25 (GMT) |
| commit | 2dee7ff0cc66438437915f7894e036953140641f (patch) | |
| tree | a7558eaa827ebcdc3908fd66cd0557670021f5f3 /tests/auto/declarative/qdeclarativelanguage/data/multiSet.3.qml | |
| parent | f309c1cc1b0212f1c882fca5adb0e7d7ef552de9 (diff) | |
| parent | 1e4258c6098a87342b61935f1ad25102ce699af1 (diff) | |
| download | Qt-2dee7ff0cc66438437915f7894e036953140641f.zip Qt-2dee7ff0cc66438437915f7894e036953140641f.tar.gz Qt-2dee7ff0cc66438437915f7894e036953140641f.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: (25 commits)
Fix zooming (broke with transformOrigin default change).
doc
Move WebView to an extension plugin.
follow syntax change
missed file
Optimization.
Add autotests for script block scoping.
Make test more reliable.
Add NOTIFY signals to list, grid and path views
Example of text focus.
Add docs and tests for WorkerListModel.
Add NOTIFY signals to list, grid and path views
Example of text focus.
Add accessor operations to VisualItemModel::children
Make "on" syntax mandatory for value sources and interceptors
Fix warning.
Minor optimization.
Test GridView.onAdd & GridView.onRemove. Reduce wait()s
Replace remaining QGuard usage with QDeclarativeGuard.
Reapply "Some animation cleanup/refactoring."
...
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage/data/multiSet.3.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/multiSet.3.qml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/multiSet.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.3.qml new file mode 100644 index 0000000..77eaba0 --- /dev/null +++ b/tests/auto/declarative/qdeclarativelanguage/data/multiSet.3.qml @@ -0,0 +1,7 @@ +import Test 1.0 + +MyTypeObject { + intProperty: a + 10 + intProperty: 10 +} + |