diff options
| -rw-r--r-- | src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | 2 | ||||
| -rw-r--r-- | tests/manual/textrendering/nativetext/main.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm index 19b450b643..7957cd130a 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm @@ -736,7 +736,7 @@ bool QCoreTextFontEngine::shouldSmoothFont() const bool QCoreTextFontEngine::expectsGammaCorrectedBlending() const { - return shouldSmoothFont(); + return shouldSmoothFont() && fontSmoothing() == Subpixel; } qreal QCoreTextFontEngine::fontSmoothingGamma() diff --git a/tests/manual/textrendering/nativetext/main.cpp b/tests/manual/textrendering/nativetext/main.cpp index 7e98dd44d0..b481e44bae 100644 --- a/tests/manual/textrendering/nativetext/main.cpp +++ b/tests/manual/textrendering/nativetext/main.cpp @@ -101,7 +101,7 @@ public: const int ascent = fontMetrics().ascent(); - QPen metricsPen(Qt::magenta, 1.0); + QPen metricsPen(QColor(112, 216, 255), 1.0); metricsPen.setCosmetic(true); p.setPen(metricsPen); p.drawLine(QPoint(0, ascent), QPoint(width(), ascent)); @@ -201,7 +201,7 @@ public: case 0: return qMakePair(QColor(), QColor()); case 1: return qMakePair(QColor(Qt::black), QColor(Qt::white)); case 2: return qMakePair(QColor(Qt::white), QColor(Qt::black)); - case 3: return qMakePair(QColor(Qt::green), QColor(Qt::red)); + case 3: return qMakePair(QColor(Qt::magenta), QColor(Qt::green)); case 4: return qMakePair(QColor(0, 0, 0, 128), QColor(Qt::white)); case 5: return qMakePair(QColor(255, 255, 255, 128), QColor(Qt::black)); default: return qMakePair(QColor(), QColor()); |