diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-29 20:25:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-29 20:25:35 (GMT) |
| commit | 3acc686f9b2de7a261fc28e256b9f87ee5e341bc (patch) | |
| tree | 83f1869e327afaf0031dcbe33298236227a9d700 /doc | |
| parent | b4afd4e4cabce0347e155803afd8ff1a7b90f080 (diff) | |
| parent | f75d82c7c3364c5f4e5b3799cbeb9daae4cf6e61 (diff) | |
| download | Qt-3acc686f9b2de7a261fc28e256b9f87ee5e341bc.zip Qt-3acc686f9b2de7a261fc28e256b9f87ee5e341bc.tar.gz Qt-3acc686f9b2de7a261fc28e256b9f87ee5e341bc.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: (54 commits)
update qml.qch to version 4.7
Undefined is undefined, and now qml warns about it
Fix so window will resize with the root object (broken by
Avoid duplicate code for testing initial sizes
Remove an unnecessary connect() in TextInput
Ensure micro focus is updated in TextEdit and TextInput
Fix flow layout not taking into account whether it's width and height are implicit or not.
Avoid binding loop.
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
...
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 |
