summaryrefslogtreecommitdiffstats
path: root/src/qt3support
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-22 14:08:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-22 14:08:53 (GMT)
commit571f0dc0a33b22bfc1f1ffd4521e7c4e5151647c (patch)
tree88f85beb8700ce745738a19417aca30f3743ca6b /src/qt3support
parentb7ba409b0dabd382876310a6c110a96cf0e3c6bf (diff)
parent3263e0d971ac263e42078064b3f275dff4f62650 (diff)
downloadQt-571f0dc0a33b22bfc1f1ffd4521e7c4e5151647c.zip
Qt-571f0dc0a33b22bfc1f1ffd4521e7c4e5151647c.tar.gz
Qt-571f0dc0a33b22bfc1f1ffd4521e7c4e5151647c.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: 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 'src/qt3support')
0 files changed, 0 insertions, 0 deletions