diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-08 08:32:48 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-08 08:32:48 (GMT) |
| commit | aa674169ca31b6e296021b3b8f5a448aeecf0973 (patch) | |
| tree | 493f0b7922ac116894a3e7f99833e97984035ccc /src/gui/painting/qwindowsurface_raster.cpp | |
| parent | 50a668e62739c715dcd4f001b659ff25f71cc9c4 (diff) | |
| parent | 941b13d52d975069d10093a873cd3a55bb2fd7dd (diff) | |
| download | Qt-aa674169ca31b6e296021b3b8f5a448aeecf0973.zip Qt-aa674169ca31b6e296021b3b8f5a448aeecf0973.tar.gz Qt-aa674169ca31b6e296021b3b8f5a448aeecf0973.tar.bz2 | |
Merge branch '4.6' into qstatictext-4.6
Diffstat (limited to 'src/gui/painting/qwindowsurface_raster.cpp')
| -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); |