diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-10-29 03:43:01 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-10-29 03:43:01 (GMT) |
| commit | 4cfcf4e233c24f3397372da8b6fdddddce7a4bcc (patch) | |
| tree | 89d15dd7f848be8fed54032c5fc8fb6841950e67 | |
| parent | 8ba02a8f5a537b9f7e1ff671abe6eed67029db58 (diff) | |
| parent | 55c4d94dfea78951f3371d3697a3cb28539b3012 (diff) | |
| download | Qt-4cfcf4e233c24f3397372da8b6fdddddce7a4bcc.zip Qt-4cfcf4e233c24f3397372da8b6fdddddce7a4bcc.tar.gz Qt-4cfcf4e233c24f3397372da8b6fdddddce7a4bcc.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | src/declarative/util/qdeclarativeview.cpp | 8 |
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); |