diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 07:00:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 07:00:13 (GMT) |
| commit | c1d0e9de6353cd4f6e209e9e05f8eca907aaee04 (patch) | |
| tree | c2aadaa141d95913404d988ee2e04dcc3a609a2d /examples/qtestlib/tutorial2 | |
| parent | d43d9c0d273911f2222f9d79b8e028458cb7abeb (diff) | |
| parent | 1bf9b8a8e8752cb1353076874e88f605c8de9837 (diff) | |
| download | Qt-c1d0e9de6353cd4f6e209e9e05f8eca907aaee04.zip Qt-c1d0e9de6353cd4f6e209e9e05f8eca907aaee04.tar.gz Qt-c1d0e9de6353cd4f6e209e9e05f8eca907aaee04.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: (3336 commits)
Make transformOrigin Center by default
Better documentation of "model" and "modelData" in delegates.
clip if tile mode is 'PreserveAspectCrop' and 'clip' property is true.
Fix test.
Allow objects to be shared between QmlEngines
Use QUrl::fromLocalFile() instead of "file://" (i.e. only 2 slashes).
Fix item removal.
Fixes: make qt-creator compile
Make atBeginning/viewArea calculations account for min extent.
Fix private header include.
Fix autotest.
Fix test.
Fix test.
Remove hacky fix (breaks autotest).
Fix Behaviors for object-type properties.
Pass symbols::prefix (Action -> QmlAction)
Add license header.
Fix bad merge (compile)
Pass tst_headers::licenseCheck
Fix ListView tests.
...
Diffstat (limited to 'examples/qtestlib/tutorial2')
0 files changed, 0 insertions, 0 deletions