From 8be546d107ac69bc48ec278396e9c3f63470fd0d Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 7 Dec 2013 08:49:34 +0100 Subject: Revert "Move the glxfbconfig configtest to qpa and rename it to glx" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a2d3b7c99165cb5c4be6f0dd83a967e1119cf732. That commit broke -opengl es2 builds on Linux desktops (when GLX is available). /usr/include/GL/gl.h:162:17: error: conflicting declaration ‘typedef double GLdouble’ qopengl.h:97:17: error: ‘GLdouble’ has a previous declaration as ‘typedef GLfloat GLdouble’ Change-Id: Id5f48c05803be1a8c03eeffca139b80e9a85a0eb Reviewed-by: Thiago Macieira --- config.tests/qpa/glx/glx.pro | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 config.tests/qpa/glx/glx.pro (limited to 'config.tests/qpa/glx/glx.pro') diff --git a/config.tests/qpa/glx/glx.pro b/config.tests/qpa/glx/glx.pro deleted file mode 100644 index da51a6d231..0000000000 --- a/config.tests/qpa/glx/glx.pro +++ /dev/null @@ -1,10 +0,0 @@ -SOURCES = glx.cpp -CONFIG += x11 -INCLUDEPATH += $$QMAKE_INCDIR_OPENGL - -for(p, QMAKE_LIBDIR_OPENGL) { - exists($$p):LIBS += -L$$p -} - -CONFIG -= qt -LIBS += -lGL -- cgit v1.2.3