diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-05 13:23:54 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-02-05 13:23:54 (GMT) |
| commit | f8fa846bdcd961105674aba3666240b6ed166b04 (patch) | |
| tree | ef2effa1ae84ba43a6bfc06651ba3fe2bf61d8b7 /src/gui/painting | |
| parent | f9c314aa306bfd4a237594775a8aeb14c858e66d (diff) | |
| parent | b5a5c7ce06291d4f9cae15383bd35677db277138 (diff) | |
| download | Qt-f8fa846bdcd961105674aba3666240b6ed166b04.zip Qt-f8fa846bdcd961105674aba3666240b6ed166b04.tar.gz Qt-f8fa846bdcd961105674aba3666240b6ed166b04.tar.bz2 | |
Merge remote branch 'origin/4.6' into 4.6
Conflicts:
dist/changes-4.6.2
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); |