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/qpa/glx/glx.pro | |
| 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/qpa/glx/glx.pro')
| -rw-r--r-- | config.tests/qpa/glx/glx.pro | 10 |
1 files changed, 0 insertions, 10 deletions
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 |