diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-17 02:03:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-17 02:03:53 (GMT) |
| commit | dc5543f5595870209e8122d13d070694b5e0eb39 (patch) | |
| tree | 09fe74aa408e9d2fc9198df71dc032e0680fe4b7 /src/gui/painting/qoutlinemapper_p.h | |
| parent | 30c8d1e3dccc83499ac3d76284cfb2e8d860808a (diff) | |
| parent | 0842309e6e04d34c027374d0793dc60d3ec6e28b (diff) | |
| download | Qt-dc5543f5595870209e8122d13d070694b5e0eb39.zip Qt-dc5543f5595870209e8122d13d070694b5e0eb39.tar.gz Qt-dc5543f5595870209e8122d13d070694b5e0eb39.tar.bz2 | |
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 crash on Mac OS X when drawing text with Qt::TextBypassShaping set
Fixed infinite recursion when drawing very large painter paths.
Fixed full-rule on clipped painter paths.
Removed unnecessary lines of code.
Fixed problem with wrong size hints when items were removed.
Diffstat (limited to 'src/gui/painting/qoutlinemapper_p.h')
| -rw-r--r-- | src/gui/painting/qoutlinemapper_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/painting/qoutlinemapper_p.h b/src/gui/painting/qoutlinemapper_p.h index 39b7593..f64d03b 100644 --- a/src/gui/painting/qoutlinemapper_p.h +++ b/src/gui/painting/qoutlinemapper_p.h @@ -95,7 +95,8 @@ public: m_tags(0), m_contours(0), m_polygon_dev(0), - m_round_coords(false) + m_round_coords(false), + m_in_clip_elements(false) { } @@ -235,6 +236,7 @@ public: qreal m_dy; bool m_valid; + bool m_in_clip_elements; private: bool m_round_coords; |