diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-04 03:39:50 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-04 03:39:50 (GMT) |
| commit | 731b85fa65b9f7234ad299559958a596f8ec5bd9 (patch) | |
| tree | cdee95cde62b8483541ab11fc0d699f7ab13157c | |
| parent | c05a595cde1327edea3a72c6fa13d2351c02805d (diff) | |
| parent | c1c52b5cd22655999a9abc6bce709e15b598d2c5 (diff) | |
| download | Qt-731b85fa65b9f7234ad299559958a596f8ec5bd9.zip Qt-731b85fa65b9f7234ad299559958a596f8ec5bd9.tar.gz Qt-731b85fa65b9f7234ad299559958a596f8ec5bd9.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | src/gui/painting/qoutlinemapper.cpp | 2 | ||||
| -rw-r--r-- | src/gui/painting/qtransform.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/painting/qoutlinemapper.cpp b/src/gui/painting/qoutlinemapper.cpp index 401fad9..d294378 100644 --- a/src/gui/painting/qoutlinemapper.cpp +++ b/src/gui/painting/qoutlinemapper.cpp @@ -225,6 +225,8 @@ void QOutlineMapper::endOutline() } } path = QTransform(m_m11, m_m12, m_m13, m_m21, m_m22, m_m23, m_dx, m_dy, m_m33).map(path); + if (!(m_outline.flags & QT_FT_OUTLINE_EVEN_ODD_FILL)) + path.setFillRule(Qt::WindingFill); uint old_txop = m_txop; m_txop = QTransform::TxNone; if (path.isEmpty()) diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index dcb8947..6a33928 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -1459,6 +1459,7 @@ static QPainterPath mapProjective(const QTransform &transform, const QPainterPat if (path.elementCount() > 0 && lastMoveTo != last) lineTo_clipped(result, transform, last, lastMoveTo, needsMoveTo, false); + result.setFillRule(path.fillRule()); return result; } |