summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2010-10-29 02:21:10 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2010-10-29 02:21:10 (GMT)
commit55c4d94dfea78951f3371d3697a3cb28539b3012 (patch)
treecfaf4748d3479a4233712a5ac502332915378fbe /src/declarative
parent2c2e16dc5b43536eba6cb89c93401fed8f3c26a8 (diff)
downloadQt-55c4d94dfea78951f3371d3697a3cb28539b3012.zip
Qt-55c4d94dfea78951f3371d3697a3cb28539b3012.tar.gz
Qt-55c4d94dfea78951f3371d3697a3cb28539b3012.tar.bz2
Regression: QML fonts look bad on Mac with font smoothing on
Task-number: QTBUG-14840
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/util/qdeclarativeview.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index 2381172..0e31a20 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -72,6 +72,7 @@
QT_BEGIN_NAMESPACE
DEFINE_BOOL_CONFIG_OPTION(frameRateDebug, QML_SHOW_FRAMERATE)
+extern Q_GUI_EXPORT bool qt_applefontsmoothing_enabled;
class QDeclarativeScene : public QGraphicsScene
{
@@ -696,7 +697,14 @@ void QDeclarativeView::paintEvent(QPaintEvent *event)
if (frameRateDebug())
time = d->frameTimer.restart();
+#ifdef Q_WS_MAC
+ bool oldSmooth = qt_applefontsmoothing_enabled;
+ qt_applefontsmoothing_enabled = false;
+#endif
QGraphicsView::paintEvent(event);
+#ifdef Q_WS_MAC
+ qt_applefontsmoothing_enabled = oldSmooth;
+#endif
QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::Painting);