diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-04-30 13:55:47 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-04-30 13:55:47 (GMT) |
| commit | 7286bc3c88c632a3e081e8df40e0f94438da1911 (patch) | |
| tree | a61d7aadb4db986bbc9dc44877c768975a746d1b | |
| parent | a24c7ee4da84d3ac8e52cafda200f07c48d0bc98 (diff) | |
| download | Qt-7286bc3c88c632a3e081e8df40e0f94438da1911.zip Qt-7286bc3c88c632a3e081e8df40e0f94438da1911.tar.gz Qt-7286bc3c88c632a3e081e8df40e0f94438da1911.tar.bz2 | |
Use QGLPixmapData for testlite when in OpenGL mode
| -rw-r--r-- | src/opengl/qpixmapdata_gl_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/testlite/qtestliteintegration.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/opengl/qpixmapdata_gl_p.h b/src/opengl/qpixmapdata_gl_p.h index c239bcb..736a28e 100644 --- a/src/opengl/qpixmapdata_gl_p.h +++ b/src/opengl/qpixmapdata_gl_p.h @@ -96,7 +96,7 @@ private: }; -class QGLPixmapData : public QPixmapData +class Q_OPENGL_EXPORT QGLPixmapData : public QPixmapData { public: QGLPixmapData(PixelType type); diff --git a/src/plugins/platforms/testlite/qtestliteintegration.cpp b/src/plugins/platforms/testlite/qtestliteintegration.cpp index f3c3688..3fa3495 100644 --- a/src/plugins/platforms/testlite/qtestliteintegration.cpp +++ b/src/plugins/platforms/testlite/qtestliteintegration.cpp @@ -54,6 +54,7 @@ #include <GL/glx.h> #include "qglxintegration.h" #include <private/qwindowsurface_gl_p.h> +#include <private/qpixmapdata_gl_p.h> #endif QT_BEGIN_NAMESPACE @@ -108,6 +109,10 @@ QTestLiteIntegration::QTestLiteIntegration(bool useOpenGL) QPixmapData *QTestLiteIntegration::createPixmapData(QPixmapData::PixelType type) const { +#ifndef QT_NO_OPENGL + if (mUseOpenGL) + return new QGLPixmapData(type); +#endif return new QRasterPixmapData(type); } |