diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-11 05:17:47 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-11 05:17:47 (GMT) |
| commit | aef2140573c5b68062db2f1a2cf968a1637344ae (patch) | |
| tree | d80351ab557500afaf9858a9be4584e6ff2b6428 /src/gui/painting/qpainter_p.h | |
| parent | ee66f86c529fd939b74589d8131b653ef5f799b5 (diff) | |
| parent | 7faaa967a4e872cc31f1bcb9e96fe08edbf639b3 (diff) | |
| download | Qt-aef2140573c5b68062db2f1a2cf968a1637344ae.zip Qt-aef2140573c5b68062db2f1a2cf968a1637344ae.tar.gz Qt-aef2140573c5b68062db2f1a2cf968a1637344ae.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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; |