diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-19 01:29:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-19 01:29:07 (GMT) |
| commit | 121f28073fd9d71ec7da632c90e582a41e1929e5 (patch) | |
| tree | 3189e6c0e9accb3243e42c1867cf20ca3991f971 /demos | |
| parent | 9bee0352ad9d9037c914c517486fe40f497f288a (diff) | |
| parent | 994d54f479e7c00832011cefc93b9d03d8ba1375 (diff) | |
| download | Qt-121f28073fd9d71ec7da632c90e582a41e1929e5.zip Qt-121f28073fd9d71ec7da632c90e582a41e1929e5.tar.gz Qt-121f28073fd9d71ec7da632c90e582a41e1929e5.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:
Fix QDeclarativeTextLayout under non-affine transformation
Fix visual tests.
ListView.visibleArea.heightRatio should not emit a signal when it does not change.
Properties should have precedence over methods.
Diffstat (limited to 'demos')
0 files changed, 0 insertions, 0 deletions