diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-05-19 17:35:29 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-05-19 17:35:29 (GMT) |
| commit | eff255bd29a8cbd09494f9e9480c2e4b07869386 (patch) | |
| tree | 362e37daa7fb813b4c64dfe4303c45e326837c6f /src/gui/painting/qpaintengine_mac.cpp | |
| parent | 38420b1f63162802ede4861faf6d34dfa956d486 (diff) | |
| parent | 83df329a42107764889f46b9019a37804c36776a (diff) | |
| download | Qt-eff255bd29a8cbd09494f9e9480c2e4b07869386.zip Qt-eff255bd29a8cbd09494f9e9480c2e4b07869386.tar.gz Qt-eff255bd29a8cbd09494f9e9480c2e4b07869386.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/gui/painting/qpaintengine_mac.cpp')
| -rw-r--r-- | src/gui/painting/qpaintengine_mac.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/painting/qpaintengine_mac.cpp index 14ba94e..e5323d8 100644 --- a/src/gui/painting/qpaintengine_mac.cpp +++ b/src/gui/painting/qpaintengine_mac.cpp @@ -1390,7 +1390,11 @@ QCoreGraphicsPaintEngine::updateRenderHints(QPainter::RenderHints hints) CGContextSetInterpolationQuality(d->hd, (hints & QPainter::SmoothPixmapTransform) ? kCGInterpolationHigh : kCGInterpolationNone); } - CGContextSetShouldSmoothFonts(d->hd, hints & QPainter::TextAntialiasing); + bool textAntialiasing = (hints & QPainter::TextAntialiasing) == QPainter::TextAntialiasing; + if (!textAntialiasing || d->disabledSmoothFonts) { + d->disabledSmoothFonts = !textAntialiasing; + CGContextSetShouldSmoothFonts(d->hd, textAntialiasing); + } } /* |