Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix warning on MSVC
  QThread: make sure start works even if called after exit
  Revert "Fixed painter path drawing on FBO without stencil buffer."
  Fix a crash with D&d on mingw
  Revert "Keep other text format with QTextOption::SuppressColors tag on"
  Fixed stencil buffer on FBOs with OpenGL ES.
  Keep other text format with QTextOption::SuppressColors tag on
  QTreeView: do not scroll to top if last item is removed

1 files changed, 0 insertions, 26 deletions

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 2347e66..aa217f6 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -866,32 +866,6 @@ void QGL2PaintEngineExPrivate::fill(const QVectorPath& path)
             if (do_vectorpath_cache)
                 path.makeCacheable();
 
-            if (!device->format().stencil()) {
-                // If there is no stencil buffer, triangulate the path instead.
-
-                QRectF bbox = path.controlPointRect();
-                // If the path doesn't fit within these limits, it is possible that the triangulation will fail.
-                bool withinLimits = (bbox.left() > -0x8000 * inverseScale)
-                                  && (bbox.right() < 0x8000 * inverseScale)
-                                  && (bbox.top() > -0x8000 * inverseScale)
-                                  && (bbox.bottom() < 0x8000 * inverseScale);
-                if (withinLimits) {
-                    QTriangleSet polys = qTriangulate(path, QTransform().scale(1 / inverseScale, 1 / inverseScale));
-
-                    QVarLengthArray<float> vertices(polys.vertices.size());
-                    for (int i = 0; i < polys.vertices.size(); ++i)
-                        vertices[i] = float(inverseScale * polys.vertices.at(i));
-
-                    prepareForDraw(currentBrush.isOpaque());
-                    setVertexAttributePointer(QT_VERTEX_COORDS_ATTR, vertices.constData());
-                    glDrawElements(GL_TRIANGLES, polys.indices.size(), GL_UNSIGNED_INT, polys.indices.constData());
-                } else {
-                    // We can't handle big, concave painter paths with OpenGL without stencil buffer.
-                    qWarning("Painter path exceeds +/-32767 pixels.");
-                }
-                return;
-            }
-
             // The path is too complicated & needs the stencil technique
             vertexCoordinateArray.clear();
             vertexCoordinateArray.addPath(path, inverseScale, false);