From 4a0ecee1fca85468c1cbcf8abb68f3d066ca4f60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Fri, 6 Aug 2010 08:41:19 +0200
Subject: Make testlite work without glx

---
 src/plugins/platforms/testlite/qglxintegration.h        |  2 --
 src/plugins/platforms/testlite/qtestliteintegration.cpp |  5 +----
 src/plugins/platforms/testlite/qtestlitewindow.cpp      | 13 +++++++++++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/plugins/platforms/testlite/qglxintegration.h b/src/plugins/platforms/testlite/qglxintegration.h
index 2f7c70e..562967a 100644
--- a/src/plugins/platforms/testlite/qglxintegration.h
+++ b/src/plugins/platforms/testlite/qglxintegration.h
@@ -87,8 +87,6 @@ private:
     static void createDefaultSharedContex(MyDisplay *xd);
 };
 
-
-
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/plugins/platforms/testlite/qtestliteintegration.cpp b/src/plugins/platforms/testlite/qtestliteintegration.cpp
index 3f500c0..a8e0fa7 100644
--- a/src/plugins/platforms/testlite/qtestliteintegration.cpp
+++ b/src/plugins/platforms/testlite/qtestliteintegration.cpp
@@ -52,10 +52,9 @@
 
 #ifndef QT_NO_OPENGL
 #include <GL/glx.h>
-#include "qglxintegration.h"
 #include <private/qwindowsurface_gl_p.h>
 #include <private/qpixmapdata_gl_p.h>
-#endif
+#endif //QT_NO_OPENGL
 
 QT_BEGIN_NAMESPACE
 
@@ -84,9 +83,7 @@ public:
 
 
 QTestLiteIntegration::QTestLiteIntegration(bool useOpenGL)
-#ifndef QT_NO_OPENGL
     : mUseOpenGL(useOpenGL)
-#endif
 {
 
     xd = new MyDisplay;
diff --git a/src/plugins/platforms/testlite/qtestlitewindow.cpp b/src/plugins/platforms/testlite/qtestlitewindow.cpp
index 39b2cc0..1f477db 100644
--- a/src/plugins/platforms/testlite/qtestlitewindow.cpp
+++ b/src/plugins/platforms/testlite/qtestlitewindow.cpp
@@ -42,6 +42,7 @@
 #include "qtestliteintegration.h"
 #include <QWindowSystemInterface>
 #include <private/qwindowsurface_p.h>
+#include <QtGui/private/qapplication_p.h>
 
 #include "qtestlitewindow.h"
 
@@ -56,7 +57,9 @@
 #include <QTimer>
 #include <QApplication>
 
+#ifndef QT_NO_OPENGL
 #include "qglxintegration.h"
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -157,8 +160,9 @@ QTestLiteWindow::QTestLiteWindow(const QTestLiteIntegration *platformIntegration
         int w = window->width();
         int h = window->height();
 
-        if(window->platformWindowFormat().windowApi() == QPlatformWindowFormat::OpenGL) {
-
+        if(window->platformWindowFormat().windowApi() == QPlatformWindowFormat::OpenGL
+           && QApplicationPrivate::platformIntegration()->hasOpenGL() ) {
+#ifndef QT_NO_OPENGL
             XVisualInfo *visualInfo = QGLXGLContext::findVisualInfo(xd,window->platformWindowFormat());
             Colormap cmap = XCreateColormap(xd->display,xd->rootWindow(),visualInfo->visual,AllocNone);
 
@@ -167,6 +171,7 @@ QTestLiteWindow::QTestLiteWindow(const QTestLiteIntegration *platformIntegration
             x_window = XCreateWindow(xd->display, xd->rootWindow(),x, y, w, h,
                                       0, visualInfo->depth, InputOutput, visualInfo->visual,
                                       CWColormap, &a);
+#endif //QT_NO_OPENGL
         } else {
             x_window = XCreateSimpleWindow(xd->display, xd->rootWindow(),
                                            x, y, w, h, 0 /*border_width*/,
@@ -1012,9 +1017,13 @@ void QTestLiteWindow::setCursor(QCursor * cursor)
 
 QPlatformGLContext *QTestLiteWindow::glContext() const
 {
+    if (!QApplicationPrivate::platformIntegration()->hasOpenGL())
+        return 0;
     if (!mGLContext) {
         QTestLiteWindow *that = const_cast<QTestLiteWindow *>(this);
+#ifndef QT_NO_OPENGL
         that->mGLContext = new QGLXGLContext(x_window, xd, widget()->platformWindowFormat());
+#endif
     }
     return mGLContext;
 }
-- 
cgit v0.12