summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-12 08:03:26 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-12 08:03:26 (GMT)
commit4a47bf6a06a4f7ebbf2336cd643c50332ac76d6d (patch)
tree48703d0af598d46c7938e9e424d453eb783cf673 /src/gui
parentc633ce4346fa04584e5168b77924ca6a42601435 (diff)
parent6a8a8f851edbc9b93948bf88d8c792e1c5dfda35 (diff)
downloadQt-4a47bf6a06a4f7ebbf2336cd643c50332ac76d6d.zip
Qt-4a47bf6a06a4f7ebbf2336cd643c50332ac76d6d.tar.gz
Qt-4a47bf6a06a4f7ebbf2336cd643c50332ac76d6d.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Turned off subpixel AA text on surface with alpha in GL2 engine. Changed a couple of GL defines from decimal to hex.
Diffstat (limited to 'src/gui')
0 files changed, 0 insertions, 0 deletions