summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_win.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-20 22:30:52 +0200
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-20 22:30:52 +0200
commit660ec910ef60513b511e2292255e53701dbb239b (patch)
treee3dc228a708a90116d0420933dafac05e7ac4445 /src/gui/text/qfontengine_win.cpp
parentd5f606f111527516bfe038a4045c8ec92f0499f7 (diff)
parentbd34833eb6d6d1a4cd848b002e44e18986376218 (diff)
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: Fixed compile warning on Windows. Fixed painter path drawing on FBO without stencil buffer. Fixed color of cosmetic pens when printing under Windows. Fixed infinite loop when loading jpeg without EOI from memory.
Diffstat (limited to 'src/gui/text/qfontengine_win.cpp')
0 files changed, 0 insertions, 0 deletions