From e102acd25673f0fd6e281f3244093200c8802c90 Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Date: Thu, 22 Apr 2010 15:38:28 +0200
Subject: Fix merge of qtextureglyphcache.cpp

The merge in 1ffc19d083a82c3f717e4f091a3af7b0241b6a6d introdcued
two different versions of the m_cy calculation simultaneously. Remove
the older version and keep the new.

Reviewed-by: TrustMe
---
 src/gui/painting/qtextureglyphcache.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index bf57460..631a9cf 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -140,7 +140,6 @@ void QTextureGlyphCache::populate(QFontEngine *fontEngine, int numGlyphs, const
             // no room on the current line, start new glyph strip
             m_cx = 0;
             m_cy += m_currentRowHeight + paddingDoubled;
-            m_cy += rowHeight;
             m_currentRowHeight = 0; // New row
         }
         if (m_cy + c.h > m_h) {
-- 
cgit v0.12