diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-31 09:55:44 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-31 09:55:44 (GMT) |
| commit | b764d3e6cb114988394e7500236ba087a3385a50 (patch) | |
| tree | bee07ca38829fcc684e2e8db02ed398acb9d7bcf /src/gui | |
| parent | 97902c7f81228fa669acc6e075681dc05b404b1a (diff) | |
| parent | 9507cbffb31b5ee4bfd9b4d2584406a2346fb668 (diff) | |
| download | Qt-b764d3e6cb114988394e7500236ba087a3385a50.zip Qt-b764d3e6cb114988394e7500236ba087a3385a50.tar.gz Qt-b764d3e6cb114988394e7500236ba087a3385a50.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed not switching to MeeGo graphicssystem.
Fixed rounding of coordinates pre-transformation in CG paintengine.
Don't include qwindowsurface_gl_p.h on QT_OPENGL_ES_1.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qpaintengine_mac.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/painting/qpaintengine_mac.cpp index c3aac1b..b07053e 100644 --- a/src/gui/painting/qpaintengine_mac.cpp +++ b/src/gui/painting/qpaintengine_mac.cpp @@ -969,7 +969,7 @@ void QCoreGraphicsPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pm, co return; bool differentSize = (QRectF(0, 0, pm.width(), pm.height()) != sr), doRestore = false; - CGRect rect = CGRectMake(qRound(r.x()), qRound(r.y()), qRound(r.width()), qRound(r.height())); + CGRect rect = CGRectMake(r.x(), r.y(), r.width(), r.height()); QCFType<CGImageRef> image; bool isBitmap = (pm.depth() == 1); if (isBitmap) { |