summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2014-12-19 15:23:12 +0100
committerAndy Shaw <andy.shaw@digia.com>2015-01-02 10:13:24 +0100
commit25d972e12eda9dadf212d24af8d8f524572bdbfa (patch)
treef945b83820db71d525ff7b5dc8054c4dd327ae22 /src
parent62323e8d1b16167662c85e412d35804418593cc6 (diff)
downloadqt4-tools-25d972e12eda9dadf212d24af8d8f524572bdbfa.tar.gz
Check world matrix is true when seeing if transformations are supported
If the world matrix is turned off then if the raster paintengine should not support transformations for the text as otherwise it could end up being incorrectly transformed. Task-number: QTBUG-35200 Change-Id: I68fa6654ee87016986ba9d9469673fc8b9e0875e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/painting/qpaintengine_raster.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index f715c142ee..42d53674d0 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -3418,6 +3418,8 @@ void QRasterPaintEngine::releaseDC(HDC) const
bool QRasterPaintEngine::supportsTransformations(const QFontEngine *fontEngine) const
{
+ if (!state()->WxF)
+ return false;
const QTransform &m = state()->matrix;
#if defined(Q_WS_WIN) && !defined(Q_WS_WINCE)
QFontEngine::Type fontEngineType = fontEngine->type();