diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2011-02-23 14:08:26 (GMT) |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2011-02-23 15:28:36 (GMT) |
| commit | cf13f99d32df6c42c5d421da41ef35e815fb46ac (patch) | |
| tree | 9a86876c54ac49c7b633407c8f7a416507ffe658 /src/gui/painting/qwindowsurface_raster_p.h | |
| parent | 78c5c1cae5f9e100bfb7388f68208406f0db4b42 (diff) | |
| parent | 0a24d2d6269d509e775f7da91c8002eddc2dcbd7 (diff) | |
| download | Qt-cf13f99d32df6c42c5d421da41ef35e815fb46ac.zip Qt-cf13f99d32df6c42c5d421da41ef35e815fb46ac.tar.gz Qt-cf13f99d32df6c42c5d421da41ef35e815fb46ac.tar.bz2 | |
Merge remote branch 'mainline/master' into merge_raster
Diffstat (limited to 'src/gui/painting/qwindowsurface_raster_p.h')
| -rw-r--r-- | src/gui/painting/qwindowsurface_raster_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/painting/qwindowsurface_raster_p.h b/src/gui/painting/qwindowsurface_raster_p.h index 4674fa0..7e46161 100644 --- a/src/gui/painting/qwindowsurface_raster_p.h +++ b/src/gui/painting/qwindowsurface_raster_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -118,6 +118,9 @@ public: #endif // QT_MAC_USE_COCOA private: +#if defined(Q_WS_X11) && !defined(QT_NO_MITSHM) + void syncX(); +#endif void prepareBuffer(QImage::Format format, QWidget *widget); Q_DECLARE_PRIVATE(QRasterWindowSurface) QScopedPointer<QRasterWindowSurfacePrivate> d_ptr; |