diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-12-07 08:49:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-07 21:17:07 +0100 |
| commit | 8be546d107ac69bc48ec278396e9c3f63470fd0d (patch) | |
| tree | c22896ec63aacfc8b46bef35692443c331b13e0d /config.tests | |
| parent | 105d10dea9d790a69595a2e73e8fea80a5d1a3ad (diff) | |
Revert "Move the glxfbconfig configtest to qpa and rename it to glx"
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 <thiago.macieira@intel.com>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/x11/glxfbconfig/glxfbconfig.cpp (renamed from config.tests/qpa/glx/glx.cpp) | 1 | ||||
| -rw-r--r-- | config.tests/x11/glxfbconfig/glxfbconfig.pro (renamed from config.tests/qpa/glx/glx.pro) | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config.tests/qpa/glx/glx.cpp b/config.tests/x11/glxfbconfig/glxfbconfig.cpp index 03af3f6131..77bedb41c8 100644 --- a/config.tests/qpa/glx/glx.cpp +++ b/config.tests/x11/glxfbconfig/glxfbconfig.cpp @@ -44,7 +44,6 @@ int main(int, char **) { - //We require glxfbconfig, ie. glx 1.3 GLXFBConfig config; config = 0; diff --git a/config.tests/qpa/glx/glx.pro b/config.tests/x11/glxfbconfig/glxfbconfig.pro index da51a6d231..65f855a5f2 100644 --- a/config.tests/qpa/glx/glx.pro +++ b/config.tests/x11/glxfbconfig/glxfbconfig.pro @@ -1,4 +1,4 @@ -SOURCES = glx.cpp +SOURCES = glxfbconfig.cpp CONFIG += x11 INCLUDEPATH += $$QMAKE_INCDIR_OPENGL |