From 399208c54b18bf7dd671439107fbb9910218a51c Mon Sep 17 00:00:00 2001
From: Jiang Jiang <jiang.jiang@nokia.com>
Date: Thu, 30 Jun 2011 12:45:44 +0200
Subject: 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>
---
 src/gui/text/qrawfont.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/gui/text/qrawfont.h')

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();
 
-- 
cgit v1.2.3