summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qrawfont.h
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2011-06-30 12:45:44 +0200
committerQt by Nokia <qt-info@nokia.com>2011-06-30 13:16:41 +0200
commit399208c54b18bf7dd671439107fbb9910218a51c (patch)
tree63f62d9fbe7dbe321aa27d7836331cc6f0fc1e48 /src/gui/text/qrawfont.h
parent13b83d896de8b00d6a373c97917ce52553a7e451 (diff)
Move glyph run merging logic to QTextLayout level
So that we can merge glyph runs from different QTextLines. Change-Id: Id8e0cc1aa21a482a995773fd55599c0011245e82 Reviewed-on: http://codereview.qt.nokia.com/950 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/gui/text/qrawfont.h')
-rw-r--r--src/gui/text/qrawfont.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h
index d517c9ad7a..e94bd99b8c 100644
--- a/src/gui/text/qrawfont.h
+++ b/src/gui/text/qrawfont.h
@@ -135,6 +135,7 @@ public:
private:
friend class QRawFontPrivate;
+ friend class QTextLayout;
void detach();