summaryrefslogtreecommitdiffstats
path: root/tools/tools.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-22 20:38:40 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-22 20:38:40 (GMT)
commit4252b1cadf1eef24a1d173bbb41ee56ab8fe0480 (patch)
tree992323f9fad712da5d6c2edda70ebd6a3b787a99 /tools/tools.pro
parentbb878bb1ee9a5272359e88d44806971e13c31486 (diff)
parenteaeaba06cea2ca0668a3c904744bab06b11077d0 (diff)
downloadQt-4252b1cadf1eef24a1d173bbb41ee56ab8fe0480.zip
Qt-4252b1cadf1eef24a1d173bbb41ee56ab8fe0480.tar.gz
Qt-4252b1cadf1eef24a1d173bbb41ee56ab8fe0480.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QPainter not restored correctly in Graphics View. Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShape Fix compilation Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines. Fix warning on MSVC QThread: make sure start works even if called after exit Revert "Fixed painter path drawing on FBO without stencil buffer." Fix a crash with D&d on mingw Revert "Keep other text format with QTextOption::SuppressColors tag on" Fixed stencil buffer on FBOs with OpenGL ES. Keep other text format with QTextOption::SuppressColors tag on QTreeView: do not scroll to top if last item is removed
Diffstat (limited to 'tools/tools.pro')
0 files changed, 0 insertions, 0 deletions