diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 10:21:53 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 10:22:22 +0200 |
commit | ce5ac7d67b59deb7c0e261e9ee21a475e6cb2e41 (patch) | |
tree | ed4dcec9a0e9002156e085ffb6715436bc2e27c5 /tests/auto/declarative/qsgimage/tst_qsgimage.cpp | |
parent | f828bee19dee73246c09af3aad913b5540f1cbd0 (diff) | |
parent | 63952084c085202e7eddca6840c518d8e07445d0 (diff) |
Merge branch 'refactor'
Conflicts:
src/declarative/items/context2d/qsgcanvasitem.cpp
src/declarative/items/context2d/qsgcontext2d.cpp
src/declarative/items/context2d/qsgcontext2d_p_p.h
src/declarative/particles/qsgcustomparticle.cpp
src/declarative/particles/qsgparticlesystem.cpp
Change-Id: I24e81d3652368c5031305ffa7f969f9f2c249c6c
Diffstat (limited to 'tests/auto/declarative/qsgimage/tst_qsgimage.cpp')
-rw-r--r-- | tests/auto/declarative/qsgimage/tst_qsgimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qsgimage/tst_qsgimage.cpp b/tests/auto/declarative/qsgimage/tst_qsgimage.cpp index 948f36cdb2..18770d0eb8 100644 --- a/tests/auto/declarative/qsgimage/tst_qsgimage.cpp +++ b/tests/auto/declarative/qsgimage/tst_qsgimage.cpp @@ -53,6 +53,7 @@ #include <QtDeclarative/qdeclarativecontext.h> #include <QtDeclarative/qdeclarativeexpression.h> #include <QtTest/QSignalSpy> +#include <QtGui/QPainter> #include "../../../shared/util.h" #include "../shared/testhttpserver.h" @@ -647,8 +648,7 @@ void tst_qsgimage::nullPixmapPaint() QtMsgHandler previousMsgHandler = qInstallMsgHandler(checkWarnings); // used to print "QTransform::translate with NaN called" - QPixmap pm = canvas->renderPixmap(); - + QPixmap pm = QPixmap::fromImage(canvas->grabFrameBuffer()); qInstallMsgHandler(previousMsgHandler); QVERIFY(numberOfWarnings == 0); delete image; |