diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:53:27 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-11-13 10:53:27 (GMT) |
| commit | becf7dc2b4b7c2609350eb3236f854c1a4a344f5 (patch) | |
| tree | 9cdc7101f704a7c6b6544c3aa74f79e5f2fdd1dc /src/3rdparty/webkit | |
| parent | 3794e55c2c8427dd8bd4f86af5e894cc80267881 (diff) | |
| parent | 60d2ab05c350f866f942a35f341f455015fdb800 (diff) | |
| download | Qt-becf7dc2b4b7c2609350eb3236f854c1a4a344f5.zip Qt-becf7dc2b4b7c2609350eb3236f854c1a4a344f5.tar.gz Qt-becf7dc2b4b7c2609350eb3236f854c1a4a344f5.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp index 117393a..bbb676b 100644 --- a/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp +++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebelement/tst_qwebelement.cpp @@ -971,7 +971,10 @@ void tst_QWebElement::render() QImage testImage(resource.width(), resource.height(), QImage::Format_ARGB32); QPainter painter0(&testImage); painter0.fillRect(imageRect, Qt::white); - painter0.drawImage(0, 0, resource); + //render() uses pixmaps internally, and pixmaps might have bit depths + // other than 32, giving different pixel values due to rounding. + QPixmap pix = QPixmap::fromImage(resource); + painter0.drawPixmap(0, 0, pix); painter0.end(); QImage image1(resource.width(), resource.height(), QImage::Format_ARGB32); |