diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-10 15:08:15 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-10 15:08:15 (GMT) |
| commit | d8f65a7f0707d8a97801ad20d690672e0124b491 (patch) | |
| tree | 0c881ac70d9063044ca1ca09290d0747bf322693 /src/gui/painting/qpainter_p.h | |
| parent | 9683cf068c3f933f836dc2a5b4a19b1c2f86d38a (diff) | |
| parent | 747444c6776d948dad479e7b6f3564d0515d4e52 (diff) | |
| download | Qt-d8f65a7f0707d8a97801ad20d690672e0124b491.zip Qt-d8f65a7f0707d8a97801ad20d690672e0124b491.tar.gz Qt-d8f65a7f0707d8a97801ad20d690672e0124b491.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene_p.h
Diffstat (limited to 'src/gui/painting/qpainter_p.h')
| -rw-r--r-- | src/gui/painting/qpainter_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter_p.h b/src/gui/painting/qpainter_p.h index 6c8821a..8d4e6c5 100644 --- a/src/gui/painting/qpainter_p.h +++ b/src/gui/painting/qpainter_p.h @@ -158,7 +158,7 @@ public: QList<QPainterClipInfo> clipInfo; // ### Make me smaller and faster to copy around... QTransform worldMatrix; // World transformation matrix, not window and viewport QTransform matrix; // Complete transformation matrix, - QPoint redirection_offset; + QTransform redirectionMatrix; int wx, wy, ww, wh; // window rectangle int vx, vy, vw, vh; // viewport rectangle qreal opacity; |