diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-06-21 11:19:27 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-06-21 11:25:35 (GMT) |
| commit | 3566ab0c99056f20964f5586b5f7a1b92c095579 (patch) | |
| tree | 284434da59db9bcae0ccb4f46192cd3cba67283a /src/plugins | |
| parent | a3fd00796dafe52d4ff138b271564daf70d1adee (diff) | |
| download | Qt-3566ab0c99056f20964f5586b5f7a1b92c095579.zip Qt-3566ab0c99056f20964f5586b5f7a1b92c095579.tar.gz Qt-3566ab0c99056f20964f5586b5f7a1b92c095579.tar.bz2 | |
Compile testlite plugin without OpenGL (QT_NO_OPENGL).
Reviewed-by: jorgen
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/testlite/qtestliteintegration.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/platforms/testlite/qtestliteintegration.cpp b/src/plugins/platforms/testlite/qtestliteintegration.cpp index 3ce9b7c..46f2384 100644 --- a/src/plugins/platforms/testlite/qtestliteintegration.cpp +++ b/src/plugins/platforms/testlite/qtestliteintegration.cpp @@ -109,16 +109,19 @@ 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); } QWindowSurface *QTestLiteIntegration::createWindowSurface(QWidget *widget, WId) const { +#ifndef QT_NO_OPENGL if (mUseOpenGL) return new QGLWindowSurface(widget); - +#endif return new QTestLiteWindowSurface(mPrimaryScreen, widget); } @@ -138,7 +141,10 @@ QPixmap QTestLiteIntegration::grabWindow(WId window, int x, int y, int width, in bool QTestLiteIntegration::hasOpenGL() const { +#ifndef QT_NO_OPENGL return glXQueryExtension(xd->display, 0, 0) != 0; +#endif + return false; } QT_END_NAMESPACE |