Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	src/gui/painting/qtextureglyphcache_p.h
	src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp

1 files changed, 12 insertions, 8 deletions

diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index e992bb2a59..2bb8ccee89 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -47,10 +47,6 @@
 #include "private/qnativeimage_p.h"
 #include "private/qfontengine_ft_p.h"
 
-#ifndef QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH
-#define QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH 256
-#endif
-
 QT_BEGIN_NAMESPACE
 
 // #define CACHE_DEBUG
@@ -212,10 +208,18 @@ void QTextureGlyphCache::populate(QFontEngine *fontEngine, int numGlyphs, const
         m_currentRowHeight = qMax(m_currentRowHeight, c.h + margin * 2);
 
         if (m_cx + c.w > m_w) {
-            // no room on the current line, start new glyph strip
-            m_cx = 0;
-            m_cy += m_currentRowHeight + paddingDoubled;
-            m_currentRowHeight = 0; // New row
+            int new_width = m_w*2;
+            while (new_width < m_cx + c.w)
+                new_width *= 2;
+            if (new_width <= maxTextureWidth()) {
+                resizeTextureData(new_width, m_h);
+                m_w = new_width;
+            } else {
+                // no room on the current line, start new glyph strip
+                m_cx = 0;
+                m_cy += m_currentRowHeight + paddingDoubled;
+                m_currentRowHeight = 0; // New row
+            }
         }
 
         c.x = m_cx;