summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine_qpa.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-29 10:17:53 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-29 11:33:35 +0100
commit3eb588078e7f4d62053584a70f7600b19ec99a0f (patch)
tree432c6bfcabf44b8fdbc4a8e1ab58054e548a77bf /src/gui/text/qfontengine_qpa.cpp
parent7b8ab4204417844e72bb66696227a422f4ef3e2d (diff)
parent02ba93dd3dc640421c79c655064f0b2c4f1465cd (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/text/qfontengine_qpa.cpp')
-rw-r--r--src/gui/text/qfontengine_qpa.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine_qpa.cpp b/src/gui/text/qfontengine_qpa.cpp
index f27a309d64..837850e4be 100644
--- a/src/gui/text/qfontengine_qpa.cpp
+++ b/src/gui/text/qfontengine_qpa.cpp
@@ -732,10 +732,10 @@ void QFontEngineMultiQPA::setFallbackFamiliesList(const QStringList &fallbacks)
}
/*
- This is used indirectly by QtWebKit when using QTextLayout::setRawFont
+ This is used indirectly by Qt WebKit when using QTextLayout::setRawFont
The purpose of this is to provide the necessary font fallbacks when drawing complex
- text. Since QtWebKit ends up repeatedly creating QTextLayout instances and passing them
+ text. Since Qt WebKit ends up repeatedly creating QTextLayout instances and passing them
the same raw font over and over again, we want to cache the corresponding multi font engine
as it may contain fallback font engines already.
*/