diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-04-29 04:38:28 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-04-29 04:38:28 (GMT) |
| commit | 19c897d9fa2ee68aa0e8a5b3d1d12ad9cc431cba (patch) | |
| tree | d1f8502fb897e1a8461d983455b03efb9605ebcf /src/gui/image/qpixmap_raster_p.h | |
| parent | 03e18459dbe8dabc6b504ea675260e23c9540f6c (diff) | |
| parent | 9ba03ca32ae12f8b135f3b4f80c445edc3e6b55e (diff) | |
| download | Qt-19c897d9fa2ee68aa0e8a5b3d1d12ad9cc431cba.zip Qt-19c897d9fa2ee68aa0e8a5b3d1d12ad9cc431cba.tar.gz Qt-19c897d9fa2ee68aa0e8a5b3d1d12ad9cc431cba.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/image/qpixmap_raster_p.h')
| -rw-r--r-- | src/gui/image/qpixmap_raster_p.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h index 48d5cf8..9d3bf72 100644 --- a/src/gui/image/qpixmap_raster_p.h +++ b/src/gui/image/qpixmap_raster_p.h @@ -58,9 +58,6 @@ #ifdef Q_WS_WIN # include "qt_windows.h" -# ifndef QT_NO_DIRECT3D -# include <d3d9.h> -# endif #endif QT_BEGIN_NAMESPACE @@ -88,10 +85,6 @@ protected: int metric(QPaintDevice::PaintDeviceMetric metric) const; private: -#if defined(Q_WS_WIN) && !defined(QT_NO_DIRECT3D) - friend class QDirect3DPaintEnginePrivate; - IDirect3DTexture9 *texture; -#endif friend class QPixmap; friend class QBitmap; friend class QDetachedPixmap; |