diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-02 08:44:23 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-02 08:44:23 (GMT) |
commit | 9d3324118b49b18899242e36dc9d58ddc03d6cb5 (patch) | |
tree | 39ab591f5442ef45226ada3b5dc79737a19e7f6a /tests/auto/qtconcurrentrun | |
parent | d5b4b11348ce270e95aa6e0012af1a161d238ab7 (diff) | |
parent | 9179e46737c796238563b2d4b66c55a398db5914 (diff) | |
download | Qt-9d3324118b49b18899242e36dc9d58ddc03d6cb5.zip Qt-9d3324118b49b18899242e36dc9d58ddc03d6cb5.tar.gz Qt-9d3324118b49b18899242e36dc9d58ddc03d6cb5.tar.bz2 |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (241 commits)
Doc: Fixed a typo
Doc: QAbstractItemModel: note unexpected behavior with beginMoveRows
Added environment variable graphicssystem switch.
Fixed a problem where QPixmaps where re-bound in non-sharing contexts.
Fix bug in QGraphicsItem::scroll() when called with no QRectF argument.
Make sure we don't pull inn /usr/X11 stuff in the qws mkspek conf
Avoid unnecessary detach / deep copy in QGraphicsItem::scroll().
Missed file.
Documentation.
Optimization for sci file loading.
Ensure text color set by S60 input method works for QML Items
License.
Avoid refilling view during model change.
Test positionAt.
Fix positionAt when autoScroll is use.
Fix example code and image
Fix doc
Fix some bugs in the QML Web Browser buttons
Fix zoom bug in QML Web Browser demo
Fix Typo
...
Diffstat (limited to 'tests/auto/qtconcurrentrun')
0 files changed, 0 insertions, 0 deletions