summaryrefslogtreecommitdiffstats
path: root/src/xml/xml.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-11 15:54:06 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-11 15:54:06 (GMT)
commit581b699cfbd729cffb1dbf4b43d6337cafa68d9b (patch)
treea7461de46eb5a4a526f6f9b6b193dd233a691a16 /src/xml/xml.pro
parent6900cf8d7cb8d1e98f3af2ac7ce909dc3b5fc2ef (diff)
parentf9a6458f4abf8327354d227b3dd87bbab50d44e9 (diff)
downloadQt-581b699cfbd729cffb1dbf4b43d6337cafa68d9b.zip
Qt-581b699cfbd729cffb1dbf4b43d6337cafa68d9b.tar.gz
Qt-581b699cfbd729cffb1dbf4b43d6337cafa68d9b.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed justify aligned text drawing with the GL1 engine. Add odf-writer benchmark. Fixed subpixel antialiased text drawing with the GL2 engine. Fixes warning in the QMacStyle Fix incorrect drawing of the hovered row on QTreeView with some styles. Track the glVertexAttribPointer and only update it if it's changed QTreeView::selectAll() wouldn't work when first column hidden
Diffstat (limited to 'src/xml/xml.pro')
0 files changed, 0 insertions, 0 deletions