diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 19:22:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-11 19:22:58 (GMT) |
| commit | 276ab224a9bfcf77814e59fe36e4dd05c3723d99 (patch) | |
| tree | 2d9d3a5f3202e58786117eef3f9e1463a9b2157b /src/gui | |
| parent | f4053c19b3e5584f97cfb0eb14d4b488259291b4 (diff) | |
| parent | 4fc638c0b4562f4b1e9c9a367535e4b570602942 (diff) | |
| download | Qt-276ab224a9bfcf77814e59fe36e4dd05c3723d99.zip Qt-276ab224a9bfcf77814e59fe36e4dd05c3723d99.tar.gz Qt-276ab224a9bfcf77814e59fe36e4dd05c3723d99.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed bug in QTransform::type() after using operator/ or operator*.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qtransform.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index 9909643..212a582 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -293,7 +293,8 @@ inline QTransform &QTransform::operator*=(qreal num) affine._dx *= num; affine._dy *= num; m_33 *= num; - m_dirty |= TxScale; + if (m_dirty < TxScale) + m_dirty = TxScale; return *this; } inline QTransform &QTransform::operator/=(qreal div) @@ -316,7 +317,7 @@ inline QTransform &QTransform::operator+=(qreal num) affine._dx += num; affine._dy += num; m_33 += num; - m_dirty |= TxProject; + m_dirty = TxProject; return *this; } inline QTransform &QTransform::operator-=(qreal num) @@ -332,7 +333,7 @@ inline QTransform &QTransform::operator-=(qreal num) affine._dx -= num; affine._dy -= num; m_33 -= num; - m_dirty |= TxProject; + m_dirty = TxProject; return *this; } |