diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 09:03:26 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-12 09:03:26 +0100 |
| commit | 4a47bf6a06a4f7ebbf2336cd643c50332ac76d6d (patch) | |
| tree | 48703d0af598d46c7938e9e424d453eb783cf673 /src/gui/painting/qemulationpaintengine.cpp | |
| parent | c633ce4346fa04584e5168b77924ca6a42601435 (diff) | |
| parent | 6a8a8f851edbc9b93948bf88d8c792e1c5dfda35 (diff) | |
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/painting/qemulationpaintengine.cpp')
0 files changed, 0 insertions, 0 deletions