diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-03-30 14:56:41 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-03-30 14:56:41 (GMT) |
| commit | 87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3 (patch) | |
| tree | f8b8c24056d54e19937dea1b0301af558597726a /src/opengl/gl2paintengineex/qtriangulatingstroker_p.h | |
| parent | 09ce407aaa4a00013a606bf0011faf6cbc654c72 (diff) | |
| parent | 00f7426f3906361fb5addb36e428648eee5e2983 (diff) | |
| download | Qt-87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3.zip Qt-87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3.tar.gz Qt-87f66d52e362de003a9f2cdaafbfbe3ba4e5fbc3.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Conflicts:
doc/src/modules.qdoc
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/opengl/gl2paintengineex/qtriangulatingstroker_p.h')
| -rw-r--r-- | src/opengl/gl2paintengineex/qtriangulatingstroker_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h b/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h index 06b8a44..956d7cc 100644 --- a/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h +++ b/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QTriangulatingStroker { public: - void process(const QVectorPath &path, const QPen &pen); + void process(const QVectorPath &path, const QPen &pen, const QRectF &clip); inline int vertexCount() const { return m_vertices.size(); } inline const float *vertices() const { return m_vertices.data(); } @@ -96,7 +96,7 @@ class QDashedStrokeProcessor public: QDashedStrokeProcessor(); - void process(const QVectorPath &path, const QPen &pen); + void process(const QVectorPath &path, const QPen &pen, const QRectF &clip); inline void addElement(QPainterPath::ElementType type, qreal x, qreal y) { m_points.add(x); |