diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/gui/image/qnativeimage_p.h | |
parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
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 |