diff options
author | Bill King <bill.king@nokia.com> | 2009-11-13 02:48:10 (GMT) |
---|---|---|
committer | Bill King <bill.king@nokia.com> | 2009-11-13 02:48:10 (GMT) |
commit | c7ef9c969fb368027135c5e7b0e9b6f53c465702 (patch) | |
tree | a9dccb0f6d3380ee13577502365117754768f356 /tests/auto/qgraphicseffect | |
parent | e80adac9902abfd423aae23dd22f490a33763228 (diff) | |
parent | 99b19431e6846a36a65f23d21a95140a081d1f1a (diff) | |
download | Qt-c7ef9c969fb368027135c5e7b0e9b6f53c465702.zip Qt-c7ef9c969fb368027135c5e7b0e9b6f53c465702.tar.gz Qt-c7ef9c969fb368027135c5e7b0e9b6f53c465702.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qgraphicseffect')
-rw-r--r-- | tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp index b40cf43..d216924 100644 --- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp +++ b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp @@ -49,6 +49,7 @@ #include <QtGui/qstyleoption.h> #include "../../shared/util.h" +#include <private/qgraphicseffect_p.h> //TESTED_CLASS= //TESTED_FILES= @@ -131,16 +132,16 @@ public: int margin() const { return m_margin; } - void draw(QPainter *painter, QGraphicsEffectSource *source) + void draw(QPainter *painter) { ++numRepaints; if (doNothingInDraw) return; - m_source = source; + m_source = source(); m_painter = painter; - m_styleOption = source->styleOption(); + m_styleOption = source()->styleOption(); m_opacity = painter->opacity(); - source->draw(painter); + drawSource(painter); } void sourceChanged(QGraphicsEffect::ChangeFlags flags) |