1 files changed, 19 insertions, 54 deletions

diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp
index 2c01ac4..5fa9f32 100644
--- a/src/opengl/qpaintengine_opengl.cpp
+++ b/src/opengl/qpaintengine_opengl.cpp
@@ -2119,6 +2119,7 @@ void QOpenGLPaintEnginePrivate::fillPath(const QPainterPath &path)
     updateGLMatrix();
 }
 
+extern bool qt_isExtendedRadialGradient(const QBrush &brush);
 
 static inline bool needsEmulation(Qt::BrushStyle style)
 {
@@ -2129,9 +2130,11 @@ static inline bool needsEmulation(Qt::BrushStyle style)
 
 void QOpenGLPaintEnginePrivate::updateUseEmulation()
 {
-    use_emulation = !use_fragment_programs
-                    && ((has_pen && needsEmulation(pen_brush_style))
-                        || (has_brush && needsEmulation(brush_style)));
+    use_emulation = (!use_fragment_programs
+                     && ((has_pen && needsEmulation(pen_brush_style))
+                         || (has_brush && needsEmulation(brush_style))))
+                    || (has_pen && qt_isExtendedRadialGradient(cpen.brush()))
+                    || (has_brush && qt_isExtendedRadialGradient(cbrush));
 }
 
 void QOpenGLPaintEngine::updatePen(const QPen &pen)
@@ -4736,7 +4739,7 @@ void QGLGlyphCache::cacheGlyphs(QGLContext *context, QFontEngine *fontEngine,
 //         qDebug() << "new context" << context << font_cache;
         qt_context_cache.insert(context, font_cache);
         if (context->isValid()) {
-            if (context->device()->devType() == QInternal::Widget) {
+            if (context->device() && context->device()->devType() == QInternal::Widget) {
                 QWidget *widget = static_cast<QWidget *>(context->device());
                 connect(widget, SIGNAL(destroyed(QObject*)), SLOT(widgetDestroyed(QObject*)));
             }
@@ -4832,7 +4835,6 @@ void QGLGlyphCache::cacheGlyphs(QGLContext *context, QFontEngine *fontEngine,
             }
 
             QImage glyph_im(fontEngine->alphaMapForGlyph(glyphs[i]));
-            glyph_im = glyph_im.convertToFormat(QImage::Format_Indexed8);
             glyph_width = glyph_im.width();
             Q_ASSERT(glyph_width >= 0);
             // pad the glyph width to an even number
@@ -4855,15 +4857,21 @@ void QGLGlyphCache::cacheGlyphs(QGLContext *context, QFontEngine *fontEngine,
 #endif
 
             if (!glyph_im.isNull()) {
-
                 int idx = 0;
                 uchar *tex_data = (uchar *) malloc(glyph_width*glyph_im.height()*2);
                 memset(tex_data, 0, glyph_width*glyph_im.height()*2);
 
+                bool is8BitGray = false;
+#ifdef Q_WS_QPA
+                if (glyph_im.format() == QImage::Format_Indexed8) {
+                    is8BitGray = true;
+                }
+#endif
+                glyph_im = glyph_im.convertToFormat(QImage::Format_Indexed8);
                 for (int y=0; y<glyph_im.height(); ++y) {
                     uchar *s = (uchar *) glyph_im.scanLine(y);
                     for (int x=0; x<glyph_im.width(); ++x) {
-                        uchar alpha = qAlpha(glyph_im.color(*s));
+                        uchar alpha = is8BitGray ? *s : qAlpha(glyph_im.color(*s));
                         tex_data[idx] = alpha;
                         tex_data[idx+1] = alpha;
                         ++s;
@@ -5442,50 +5450,7 @@ void QOpenGLPaintEngine::transformChanged()
     updateMatrix(state()->matrix);
 }
 
-static QPainterPath painterPathFromVectorPath(const QVectorPath &path)
-{
-    const qreal *points = path.points();
-    const QPainterPath::ElementType *types = path.elements();
-
-    QPainterPath p;
-    if (types) {
-        int id = 0;
-        for (int i=0; i<path.elementCount(); ++i) {
-            switch(types[i]) {
-            case QPainterPath::MoveToElement:
-                p.moveTo(QPointF(points[id], points[id+1]));
-                id+=2;
-                break;
-            case QPainterPath::LineToElement:
-                p.lineTo(QPointF(points[id], points[id+1]));
-                id+=2;
-                break;
-            case QPainterPath::CurveToElement: {
-                QPointF p1(points[id], points[id+1]);
-                QPointF p2(points[id+2], points[id+3]);
-                QPointF p3(points[id+4], points[id+5]);
-                p.cubicTo(p1, p2, p3);
-                id+=6;
-                break;
-            }
-            case QPainterPath::CurveToDataElement:
-                ;
-                break;
-            }
-        }
-    } else {
-        p.moveTo(QPointF(points[0], points[1]));
-        int id = 2;
-        for (int i=1; i<path.elementCount(); ++i) {
-            p.lineTo(QPointF(points[id], points[id+1]));
-            id+=2;
-        }
-    }
-    if (path.hints() & QVectorPath::WindingFill)
-        p.setFillRule(Qt::WindingFill);
-
-    return p;
-}
+extern QPainterPath qt_painterPathFromVectorPath(const QVectorPath &path);
 
 void QOpenGLPaintEngine::fill(const QVectorPath &path, const QBrush &brush)
 {
@@ -5494,11 +5459,11 @@ void QOpenGLPaintEngine::fill(const QVectorPath &path, const QBrush &brush)
     if (brush.style() == Qt::NoBrush)
         return;
 
-    if (!d->use_fragment_programs && needsEmulation(brush.style())) {
+    if ((!d->use_fragment_programs && needsEmulation(brush.style())) || qt_isExtendedRadialGradient(brush)) {
         QPainter *p = painter();
         QBrush oldBrush = p->brush();
         p->setBrush(brush);
-        qt_draw_helper(p->d_ptr.data(), painterPathFromVectorPath(path), QPainterPrivate::FillDraw);
+        qt_draw_helper(p->d_ptr.data(), qt_painterPathFromVectorPath(path), QPainterPrivate::FillDraw);
         p->setBrush(oldBrush);
         return;
     }
@@ -5515,7 +5480,7 @@ void QOpenGLPaintEngine::fill(const QVectorPath &path, const QBrush &brush)
         drawRects(&r, 1);
         updatePen(old_pen);
     } else {
-        d->fillPath(painterPathFromVectorPath(path));
+        d->fillPath(qt_painterPathFromVectorPath(path));
     }
 
     updateBrush(old_brush, state()->brushOrigin);