diff options
Diffstat (limited to 'src/gui/image/qnativeimage_p.h')
-rw-r--r-- | src/gui/image/qnativeimage_p.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/gui/image/qnativeimage_p.h b/src/gui/image/qnativeimage_p.h index e468917a67..f9132de69e 100644 --- a/src/gui/image/qnativeimage_p.h +++ b/src/gui/image/qnativeimage_p.h @@ -58,9 +58,6 @@ #ifdef Q_WS_WIN #include "qt_windows.h" -#elif defined(Q_WS_X11) -#include <private/qt_x11_p.h> - #elif defined(Q_WS_MAC) #include <private/qt_mac_p.h> @@ -68,12 +65,12 @@ QT_BEGIN_NAMESPACE -class QWidget; +class QWindow; class QNativeImage { public: - QNativeImage(int width, int height, QImage::Format format, bool isTextBuffer = false, QWidget *widget = 0); + QNativeImage(int width, int height, QImage::Format format, bool isTextBuffer = false, QWindow *window = 0); ~QNativeImage(); inline int width() const; @@ -88,11 +85,6 @@ public: HBITMAP bitmap; HBITMAP null_bitmap; -#elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM) - XImage *xshmimg; - Pixmap xshmpm; - XShmSegmentInfo xshminfo; - #elif defined(Q_WS_MAC) CGContextRef cg; #endif |