Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: (31 commits)
  Make QtQuick2 compile on QPA
  Use maximum ascent/descent/leading from fallback fonts in shaping
  Another ugly hack to make bidi cursor work with Core Text
  Make sure layoutData exist before checking for string direction
  Removed warning from QPixmap::handle().
  Take leading space width into account for painting and selection
  doc: Simplify language in QGlyphs docs
  doc: Minor cleanup in QGlyphs docs
  Remove extra comma at the end of enum list
  Fix compilation with Qt3Support
  Don't transform glyph positions for Core Graphics paint engine
  Skip linearGradientSymmetry test on QWS.
  Turn on HarfBuzz support for Mac/Cocoa
  Support visual cursor movement for BIDI text
  Disable tst_QPixmap::onlyNullPixmapsOutsideGuiThread on Mac
  Revert "Switch the default graphics system to raster on Mac."
  Fix an race condition in the auto test.
  Made linearGradientSymmetry test pass on qreal=float platforms.
  Make sure #ifdef'd tests still have main() function
  Long live QRawFont!
  ...

1 files changed, 111 insertions, 0 deletions

diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index 588c35ac5b..1f42e02c7b 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -173,6 +173,9 @@ public:
     bool forcePenChange;    // Force a pen change, even if the same.
     bool forceBrushChange;  // Force a brush change, even if the same.
 
+    bool hasExtendedRadialGradientPen; // Current pen's brush is extended radial gradient.
+    bool hasExtendedRadialGradientBrush; // Current brush is extended radial gradient.
+
     VGPaintType penType;    // Type of the last pen that was set.
     VGPaintType brushType;  // Type of the last brush that was set.
 
@@ -275,6 +278,27 @@ public:
         }
     }
 
+    inline bool needsEmulation(const QBrush &brush) const
+    {
+        extern bool qt_isExtendedRadialGradient(const QBrush &brush);
+        return qt_isExtendedRadialGradient(brush);
+    }
+
+    inline bool needsEmulation() const
+    {
+        return hasExtendedRadialGradientPen || hasExtendedRadialGradientBrush;
+    }
+
+    inline bool needsPenEmulation() const
+    {
+        return hasExtendedRadialGradientPen;
+    }
+
+    inline bool needsBrushEmulation() const
+    {
+        return hasExtendedRadialGradientBrush;
+    }
+
     // Set various modes, but only if different.
     inline void setImageMode(VGImageMode mode);
     inline void setRenderingQuality(VGRenderingQuality mode);
@@ -355,6 +379,10 @@ void QVGPaintEnginePrivate::init()
 
     forcePenChange = true;
     forceBrushChange = true;
+
+    hasExtendedRadialGradientPen = false;
+    hasExtendedRadialGradientBrush = false;
+
     penType = (VGPaintType)0;
     brushType = (VGPaintType)0;
 
@@ -1536,6 +1564,10 @@ bool QVGPaintEngine::end()
 void QVGPaintEngine::draw(const QVectorPath &path)
 {
     Q_D(QVGPaintEngine);
+    if (d->needsEmulation()) {
+        QPaintEngineEx::draw(path);
+        return;
+    }
     QVGPainterState *s = state();
     VGPath vgpath = d->vectorPathToVGPath(path);
     if (!path.hasWindingFill())
@@ -1545,9 +1577,19 @@ void QVGPaintEngine::draw(const QVectorPath &path)
     vgDestroyPath(vgpath);
 }
 
+extern QPainterPath qt_painterPathFromVectorPath(const QVectorPath &path);
+
 void QVGPaintEngine::fill(const QVectorPath &path, const QBrush &brush)
 {
     Q_D(QVGPaintEngine);
+    if (d->needsEmulation(brush)) {
+        QPainter *p = painter();
+        QBrush oldBrush = p->brush();
+        p->setBrush(brush);
+        qt_draw_helper(p->d_ptr.data(), qt_painterPathFromVectorPath(path), QPainterPrivate::FillDraw);
+        p->setBrush(oldBrush);
+        return;
+    }
     VGPath vgpath = d->vectorPathToVGPath(path);
     if (!path.hasWindingFill())
         d->fill(vgpath, brush, VG_EVEN_ODD);
@@ -1559,6 +1601,10 @@ void QVGPaintEngine::fill(const QVectorPath &path, const QBrush &brush)
 void QVGPaintEngine::stroke(const QVectorPath &path, const QPen &pen)
 {
     Q_D(QVGPaintEngine);
+    if (d->needsEmulation(pen.brush())) {
+        QPaintEngineEx::stroke(path, pen);
+        return;
+    }
     VGPath vgpath = d->vectorPathToVGPath(path);
     d->stroke(vgpath, pen);
     vgDestroyPath(vgpath);
@@ -2362,12 +2408,17 @@ void QVGPaintEngine::penChanged()
 {
     Q_D(QVGPaintEngine);
     d->dirty |= QPaintEngine::DirtyPen;
+
+    d->hasExtendedRadialGradientPen =
+        state()->pen.style() != Qt::NoPen && d->needsEmulation(state()->pen.brush());
 }
 
 void QVGPaintEngine::brushChanged()
 {
     Q_D(QVGPaintEngine);
     d->dirty |= QPaintEngine::DirtyBrush;
+
+    d->hasExtendedRadialGradientPen = d->needsEmulation(state()->brush);
 }
 
 void QVGPaintEngine::brushOriginChanged()
@@ -2546,6 +2597,11 @@ void QVGPaintEngine::fillRect(const QRectF &rect, const QBrush &brush)
         return;
     }
 
+    if (d->needsEmulation(brush)) {
+        QPaintEngineEx::fillRect(rect, brush);
+        return;
+    }
+
 #if !defined(QVG_NO_MODIFY_PATH)
     VGfloat coords[8];
     if (d->simpleTransform) {
@@ -2623,6 +2679,10 @@ void QVGPaintEngine::fillRect(const QRectF &rect, const QColor &color)
 void QVGPaintEngine::drawRoundedRect(const QRectF &rect, qreal xrad, qreal yrad, Qt::SizeMode mode)
 {
     Q_D(QVGPaintEngine);
+    if (d->needsEmulation()) {
+        QPaintEngineEx::drawRoundedRect(rect, xrad, yrad, mode);
+        return;
+    }
     if (d->simpleTransform) {
         QVGPainterState *s = state();
         VGPath vgpath = d->roundedRectPath(rect, xrad, yrad, mode);
@@ -2639,6 +2699,10 @@ void QVGPaintEngine::drawRects(const QRect *rects, int rectCount)
 {
 #if !defined(QVG_NO_MODIFY_PATH)
     Q_D(QVGPaintEngine);
+    if (d->needsEmulation()) {
+        QPaintEngineEx::drawRects(rects, rectCount);
+        return;
+    }
     QVGPainterState *s = state();
     for (int i = 0; i < rectCount; ++i, ++rects) {
         VGfloat coords[8];
@@ -2680,6 +2744,10 @@ void QVGPaintEngine::drawRects(const QRectF *rects, int rectCount)
 {
 #if !defined(QVG_NO_MODIFY_PATH)
     Q_D(QVGPaintEngine);
+    if (d->needsEmulation()) {
+        QPaintEngineEx::drawRects(rects, rectCount);
+        return;
+    }
     QVGPainterState *s = state();
     for (int i = 0; i < rectCount; ++i, ++rects) {
         VGfloat coords[8];
@@ -2718,6 +2786,10 @@ void QVGPaintEngine::drawLines(const QLine *lines, int lineCount)
 {
 #if !defined(QVG_NO_MODIFY_PATH)
     Q_D(QVGPaintEngine);
+    if (d->needsEmulation()) {
+        QPaintEngineEx::drawLines(lines, lineCount);
+        return;
+    }
     QVGPainterState *s = state();
     for (int i = 0; i < lineCount; ++i, ++lines) {
         VGfloat coords[4];
@@ -2746,6 +2818,10 @@ void QVGPaintEngine::drawLines(const QLineF *lines, int lineCount)
 {
 #if !defined(QVG_NO_MODIFY_PATH)
     Q_D(QVGPaintEngine);
+    if (d->needsEmulation()) {
+        QPaintEngineEx::drawLines(lines, lineCount);
+        return;
+    }
     QVGPainterState *s = state();
     for (int i = 0; i < lineCount; ++i, ++lines) {
         VGfloat coords[4];
@@ -2775,6 +2851,10 @@ void QVGPaintEngine::drawEllipse(const QRectF &r)
     // Based on the description of vguEllipse() in the OpenVG specification.
     // We don't use vguEllipse(), to avoid unnecessary library dependencies.
     Q_D(QVGPaintEngine);
+    if (d->needsEmulation()) {
+        QPaintEngineEx::drawEllipse(r);
+        return;
+    }
     if (d->simpleTransform) {
         QVGPainterState *s = state();
         VGPath path = vgCreatePath(VG_PATH_FORMAT_STANDARD,
@@ -2825,6 +2905,10 @@ void QVGPaintEngine::drawPath(const QPainterPath &path)
     // Shortcut past the QPainterPath -> QVectorPath conversion,
     // converting the QPainterPath directly into a VGPath.
     Q_D(QVGPaintEngine);
+    if (d->needsEmulation()) {
+        QPaintEngineEx::drawPath(path);
+        return;
+    }
     QVGPainterState *s = state();
     VGPath vgpath = d->painterPathToVGPath(path);
     if (path.fillRule() == Qt::OddEvenFill)
@@ -2839,6 +2923,11 @@ void QVGPaintEngine::drawPoints(const QPointF *points, int pointCount)
 #if !defined(QVG_NO_MODIFY_PATH)
     Q_D(QVGPaintEngine);
 
+    if (d->needsPenEmulation()) {
+        QPaintEngineEx::drawPoints(points, pointCount);
+        return;
+    }
+
     // Set up a new pen if necessary.
     QPen pen = state()->pen;
     if (pen.style() == Qt::NoPen)
@@ -2873,6 +2962,11 @@ void QVGPaintEngine::drawPoints(const QPoint *points, int pointCount)
 #if !defined(QVG_NO_MODIFY_PATH)
     Q_D(QVGPaintEngine);
 
+    if (d->needsEmulation()) {
+        QPaintEngineEx::drawPoints(points, pointCount);
+        return;
+    }
+
     // Set up a new pen if necessary.
     QPen pen = state()->pen;
     if (pen.style() == Qt::NoPen)
@@ -2905,6 +2999,12 @@ void QVGPaintEngine::drawPoints(const QPoint *points, int pointCount)
 void QVGPaintEngine::drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode)
 {
     Q_D(QVGPaintEngine);
+
+    if (d->needsEmulation()) {
+        QPaintEngineEx::drawPolygon(points, pointCount, mode);
+        return;
+    }
+
     QVGPainterState *s = state();
     VGPath path = vgCreatePath(VG_PATH_FORMAT_STANDARD,
                                VG_PATH_DATATYPE_F,
@@ -2952,6 +3052,12 @@ void QVGPaintEngine::drawPolygon(const QPointF *points, int pointCount, PolygonD
 void QVGPaintEngine::drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode)
 {
     Q_D(QVGPaintEngine);
+
+    if (d->needsEmulation()) {
+        QPaintEngineEx::drawPolygon(points, pointCount, mode);
+        return;
+    }
+
     QVGPainterState *s = state();
     VGPath path = vgCreatePath(VG_PATH_FORMAT_STANDARD,
                                VG_PATH_DATATYPE_F,
@@ -3611,6 +3717,11 @@ void QVGPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem)
         return;
     }
 
+    if (d->needsPenEmulation()) {
+        QPaintEngineEx::drawTextItem(p, textItem);
+        return;
+    }
+
     // Get the glyphs and positions associated with the text item.
     QVarLengthArray<QFixedPoint> positions;
     QVarLengthArray<glyph_t> glyphs;