diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-29 08:51:04 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-29 08:51:04 (GMT) |
| commit | fc87ef723d5a030fd701257eeca471e450e08fbb (patch) | |
| tree | dcd380c789de4cc2b586c66277b39b8c9fc0d76f /src/gui/painting | |
| parent | 87136163dcd7ffb8759875bca2b4e559a32167cd (diff) | |
| parent | e154fb84b075ad3fda4ac02d620b28cc50e46c09 (diff) | |
| download | Qt-fc87ef723d5a030fd701257eeca471e450e08fbb.zip Qt-fc87ef723d5a030fd701257eeca471e450e08fbb.tar.gz Qt-fc87ef723d5a030fd701257eeca471e450e08fbb.tar.bz2 | |
Merge remote-tracking branch 'upstream/4.8'
Conflicts:
tools/qdoc3/cppcodemarker.cpp
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qpaintengine_raster.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index b4b55de..36786c4 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -3098,7 +3098,7 @@ void QRasterPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textIte ensurePen(); ensureState(); -#if defined (Q_WS_WIN) || defined(Q_WS_MAC) +#if defined (Q_WS_WIN) || defined(Q_WS_MAC) || (defined(Q_OS_MAC) && defined(Q_WS_QPA)) if (!supportsTransformations(ti.fontEngine)) { QVarLengthArray<QFixedPoint> positions; @@ -3438,7 +3438,7 @@ bool QRasterPaintEngine::supportsTransformations(const QFontEngine *fontEngine) bool QRasterPaintEngine::supportsTransformations(qreal pixelSize, const QTransform &m) const { -#if defined(Q_WS_MAC) +#if defined(Q_WS_MAC) || (defined(Q_OS_MAC) && defined(Q_WS_QPA)) // Mac font engines don't support scaling and rotation if (m.type() > QTransform::TxTranslate) #else |