diff -r 000000000000 -r 1918ee327afb src/gui/painting/qpainterpath_p.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/painting/qpainterpath_p.h	Mon Jan 11 14:00:40 2010 +0000
@@ -0,0 +1,258 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QPAINTERPATH_P_H
+#define QPAINTERPATH_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "QtGui/qpainterpath.h"
+#include "QtGui/qregion.h"
+#include "QtCore/qlist.h"
+#include "QtCore/qvarlengtharray.h"
+
+#include <qdebug.h>
+
+#include <private/qvectorpath_p.h>
+#include <private/qstroker_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QPainterPathStrokerPrivate
+{
+public:
+    QPainterPathStrokerPrivate();
+
+    QStroker stroker;
+    QVector<qfixed> dashPattern;
+    qreal dashOffset;
+};
+
+class QPolygonF;
+class QVectorPathConverter;
+
+class QVectorPathConverter
+{
+public:
+    QVectorPathConverter(const QVector<QPainterPath::Element> &path, uint fillRule)
+        : pathData(path, fillRule),
+          path(pathData.points.data(), path.size(),
+               pathData.elements.data(), pathData.flags) {}
+
+    const QVectorPath &vectorPath() {
+        return path;
+    }
+
+    struct QVectorPathData {
+        QVectorPathData(const QVector<QPainterPath::Element> &path, uint fillRule)
+            : elements(path.size()),
+              points(path.size() * 2),
+              flags(0)
+        {
+            int ptsPos = 0;
+            for (int i=0; i<path.size(); ++i) {
+                const QPainterPath::Element &e = path.at(i);
+                elements[i] = e.type;
+                points[ptsPos++] = e.x;
+                points[ptsPos++] = e.y;
+                if (e.type == QPainterPath::CurveToElement)
+                    flags |= QVectorPath::CurvedShapeHint;
+            }
+
+            if (fillRule == Qt::WindingFill)
+                flags |= QVectorPath::WindingFill;
+            else
+                flags |= QVectorPath::OddEvenFill;
+
+        }
+        QVarLengthArray<QPainterPath::ElementType> elements;
+        QVarLengthArray<qreal> points;
+        uint flags;
+    };
+
+    QVectorPathData pathData;
+    QVectorPath path;
+
+private:
+    Q_DISABLE_COPY(QVectorPathConverter)
+};
+
+class QPainterPathData : public QPainterPathPrivate
+{
+public:
+    QPainterPathData() :
+        cStart(0), fillRule(Qt::OddEvenFill),
+        dirtyBounds(false), dirtyControlBounds(false),
+        pathConverter(0)
+    {
+        ref = 1;
+        require_moveTo = false;
+    }
+
+    QPainterPathData(const QPainterPathData &other) :
+        QPainterPathPrivate(), cStart(other.cStart), fillRule(other.fillRule),
+        dirtyBounds(other.dirtyBounds), bounds(other.bounds),
+        dirtyControlBounds(other.dirtyControlBounds),
+        controlBounds(other.controlBounds),
+        pathConverter(0)
+    {
+        ref = 1;
+        require_moveTo = false;
+        elements = other.elements;
+    }
+
+    ~QPainterPathData() {
+        delete pathConverter;
+    }
+
+    inline bool isClosed() const;
+    inline void close();
+    inline void maybeMoveTo();
+
+    const QVectorPath &vectorPath() {
+        if (!pathConverter)
+            pathConverter = new QVectorPathConverter(elements, fillRule);
+        return pathConverter->path;
+    }
+
+    int cStart;
+    Qt::FillRule fillRule;
+
+    bool require_moveTo;
+
+    bool   dirtyBounds;
+    QRectF bounds;
+    bool   dirtyControlBounds;
+    QRectF controlBounds;
+
+    QVectorPathConverter *pathConverter;
+};
+
+
+inline const QPainterPath QVectorPath::convertToPainterPath() const
+{
+        QPainterPath path;
+        path.ensureData();
+        QPainterPathData *data = path.d_func();
+        data->elements.reserve(m_count);
+        int index = 0;
+        data->elements[0].x = m_points[index++];
+        data->elements[0].y = m_points[index++];
+
+        if (m_elements) {
+            data->elements[0].type = m_elements[0];
+            for (int i=1; i<m_count; ++i) {
+                QPainterPath::Element element;
+                element.x = m_points[index++];
+                element.y = m_points[index++];
+                element.type = m_elements[i];
+                data->elements << element;
+            }
+        } else {
+            data->elements[0].type = QPainterPath::MoveToElement;
+            for (int i=1; i<m_count; ++i) {
+                QPainterPath::Element element;
+                element.x = m_points[index++];
+                element.y = m_points[index++];
+                element.type = QPainterPath::LineToElement;
+                data->elements << element;
+            }
+        }
+
+        if (m_hints & OddEvenFill)
+            data->fillRule = Qt::OddEvenFill;
+        else
+            data->fillRule = Qt::WindingFill;
+        return path;
+}
+
+void Q_GUI_EXPORT qt_find_ellipse_coords(const QRectF &r, qreal angle, qreal length,
+                                         QPointF* startPoint, QPointF *endPoint);
+
+inline bool QPainterPathData::isClosed() const
+{
+    const QPainterPath::Element &first = elements.at(cStart);
+    const QPainterPath::Element &last = elements.last();
+    return first.x == last.x && first.y == last.y;
+}
+
+inline void QPainterPathData::close()
+{
+    Q_ASSERT(ref == 1);
+    require_moveTo = true;
+    const QPainterPath::Element &first = elements.at(cStart);
+    QPainterPath::Element &last = elements.last();
+    if (first.x != last.x || first.y != last.y) {
+        if (qFuzzyCompare(first.x, last.x) && qFuzzyCompare(first.y, last.y)) {
+            last.x = first.x;
+            last.y = first.y;
+        } else {
+            QPainterPath::Element e = { first.x, first.y, QPainterPath::LineToElement };
+            elements << e;
+        }
+    }
+}
+
+inline void QPainterPathData::maybeMoveTo()
+{
+    if (require_moveTo) {
+        QPainterPath::Element e = elements.last();
+        e.type = QPainterPath::MoveToElement;
+        elements.append(e);
+        require_moveTo = false;
+    }
+}
+
+#define KAPPA 0.5522847498
+
+
+QT_END_NAMESPACE
+
+#endif // QPAINTERPATH_P_H