diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-09 09:27:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-09 09:27:51 (GMT) |
| commit | f4d385cec1f09971163d7e5d9e9b09b19f1873c4 (patch) | |
| tree | 77fcae776896372aba3e6d3609c4204e0ed906d3 /dist | |
| parent | dec972419b5758601d177bbbae0a3a1fe890824d (diff) | |
| parent | 6129a16a74620916d3e8bff29a3788374ca21c94 (diff) | |
| download | Qt-f4d385cec1f09971163d7e5d9e9b09b19f1873c4.zip Qt-f4d385cec1f09971163d7e5d9e9b09b19f1873c4.tar.gz Qt-f4d385cec1f09971163d7e5d9e9b09b19f1873c4.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 auto test failure.
PathView regression: dragging the path didn't update currentIndex
Fix docs for variant and list basic types
Add test for importing plugins that contain QML files
Call onAdd() for first items added to ListView and GridView
Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from master.
Don't clear pre-edit text when a graphics items loses focus.
Diffstat (limited to 'dist')
0 files changed, 0 insertions, 0 deletions