Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (54 commits)
  Update internal state before emitting configurationChanged() signals.
  Fixed qmlshadersplugin manual test shaders on SGX family GPU:s.
  Fixed qmlshadersplugin on windows VC2008 toolchain.
  Reset input context in Symbian when another window is opened.
  KERN-EXEC 3 panic in QCoeFepInputContext::translateInputWidget()
  Close context menus during orientation change.
  Have -small-screen enabled in certain examples on Symbian always.
  Update Japanese translations.
  Revert some of "Make QMLViewer startup animation stop after a while"
  Fix for winscw QtGui.def
  Add private method for flushing the pixmap cache.
  QDeclarative: Fix QPerformanceTimer on Symbian
  Fix QTreeWidget autotest cases on Symbian/VGA
  Increase SSL readbuffer 1 -> 16 kB
  Fix pixel metrics for Symbian VGA devices
  Revert "Fix QNetworkConfigurationManager usage outside main thread first"
  Avoid buffer overrun in QMacPixmapData resizing
  Fix glyph metrics with QStaticText/Freetype/raster and light/no hinting
  Fix tst_QGraphicsItem::sorting() test case for Symbian
  Fix QHeaderView test case for VGA Symbian devices.
  ...

1 files changed, 2 insertions, 6 deletions

diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp
index 613c473c5b..4bb4759b81 100644
--- a/src/gui/painting/qtextureglyphcache.cpp
+++ b/src/gui/painting/qtextureglyphcache.cpp
@@ -296,14 +296,10 @@ void QTextureGlyphCache::fillInPendingGlyphs()
 QImage QTextureGlyphCache::textureMapForGlyph(glyph_t g, QFixed subPixelPosition) const
 {
 #if defined(Q_WS_X11)
-    if (m_transform.type() > QTransform::TxTranslate && m_current_fontengine->type() == QFontEngine::Freetype) {
+    if (m_type != Raster_RGBMask && m_transform.type() > QTransform::TxTranslate && m_current_fontengine->type() == QFontEngine::Freetype) {
         QFontEngineFT::GlyphFormat format = QFontEngineFT::Format_None;
         QImage::Format imageFormat = QImage::Format_Invalid;
         switch (m_type) {
-        case Raster_RGBMask:
-            format = QFontEngineFT::Format_A32;
-            imageFormat = QImage::Format_RGB32;
-            break;
         case Raster_A8:
             format = QFontEngineFT::Format_A8;
             imageFormat = QImage::Format_Indexed8;
@@ -388,7 +384,7 @@ void QImageTextureGlyphCache::fillTexture(const Coord &c, glyph_t g, QFixed subP
     }
 #endif
 
-    if (m_type == QFontEngineGlyphCache::Raster_RGBMask) {        
+    if (m_type == QFontEngineGlyphCache::Raster_RGBMask) {
         QImage ref(m_image.bits() + (c.x * 4 + c.y * m_image.bytesPerLine()),
                    qMax(mask.width(), c.w), qMax(mask.height(), c.h), m_image.bytesPerLine(),
                    m_image.format());