diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-29 01:22:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-29 01:22:47 (GMT) |
| commit | 53d449fd966ba486b37dde1fce7068eb068b6a93 (patch) | |
| tree | 64ed70253504a98082038e835b78192645e27e61 /doc | |
| parent | e391d5bb96e08db99ecb5e9efcda439450922dcc (diff) | |
| parent | 189d2660968368532761586ffd495eb6c18cdbdf (diff) | |
| download | Qt-53d449fd966ba486b37dde1fce7068eb068b6a93.zip Qt-53d449fd966ba486b37dde1fce7068eb068b6a93.tar.gz Qt-53d449fd966ba486b37dde1fce7068eb068b6a93.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: (46 commits)
Ensure Loader item change listener is removed when Loader is destroyed
Adapt all qmlviewer testcases to the code changes in the actual viewer.
Stop QMLLauncher from crashing on exit on Mac when quitting app via the
VisualDataModel hasModelChildren role shadowed user roles.
Allow positioning of ListView items width sub-pixel precision.
Examples clean up
Docs
Improve appearance when scaling
Tweak Qt Demo Behaviour
forget to rename the moc include when renaming deviceorientation_maemo.cpp
fix namespace macros
fix QML Viewer resize modes
forgot to cleanup the code a bit after adding Maemo5 support
Make the QML viewer usable on the N900
Test QTBUG-11222
Test ListElement type via type system, not string comparison.
Test only on X11, not only on Linux (which includes embedded).
Handle enums in method arguments in the same way as QtScript
Allow custom parsers to handle attached properties
Allow components to be created from .pragma library JS files
...
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/images/qml-focus-example.png | bin | 43921 -> 31370 bytes |
| -rw-r--r-- | doc/src/images/qml-xmlhttprequest-example.png | bin | 21311 -> 20934 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/qml-focus-example.png b/doc/src/images/qml-focus-example.png Binary files differindex 0ec2bff..107d2cb 100644 --- a/doc/src/images/qml-focus-example.png +++ b/doc/src/images/qml-focus-example.png diff --git a/doc/src/images/qml-xmlhttprequest-example.png b/doc/src/images/qml-xmlhttprequest-example.png Binary files differindex 68e7d27..f585613 100644 --- a/doc/src/images/qml-xmlhttprequest-example.png +++ b/doc/src/images/qml-xmlhttprequest-example.png |
