diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-02-05 15:02:30 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-02-05 15:02:30 (GMT) |
| commit | 12f9af3d569210e928d1d5e3a174c53a97dd3372 (patch) | |
| tree | a2c4ab87deeb87cd5256a1df9e1b80df3be61094 /src/gui/painting | |
| parent | ced7ed0bc745618e1b0618a17b112f983dd4a9c6 (diff) | |
| parent | 906f77bcfd4358f35155075b6d5fd8a383adadba (diff) | |
| download | Qt-12f9af3d569210e928d1d5e3a174c53a97dd3372.zip Qt-12f9af3d569210e928d1d5e3a174c53a97dd3372.tar.gz Qt-12f9af3d569210e928d1d5e3a174c53a97dd3372.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qwindowsurface_raster.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp index a0d2b9b..eee6bef 100644 --- a/src/gui/painting/qwindowsurface_raster.cpp +++ b/src/gui/painting/qwindowsurface_raster.cpp @@ -295,10 +295,8 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi CGContextRestoreGState(context); #ifndef QT_MAC_USE_COCOA QDEndCGContext(port, &context); -#else - CGContextFlush(context); -#endif #endif +#endif // Q_WS_MAC #ifdef Q_OS_SYMBIAN Q_UNUSED(widget); |