diff options
| author | Jorgen Lind <jorgen.lind@digia.com> | 2013-11-28 11:06:29 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-28 12:57:33 +0100 |
| commit | a2d3b7c99165cb5c4be6f0dd83a967e1119cf732 (patch) | |
| tree | c8fcce1112069d4af0982d18849a1e2ca6ae809d /config.tests | |
| parent | d34cae51fa7b3952b651401c9e43ffd7b3d0d32c (diff) | |
| download | qtbase-a2d3b7c99165cb5c4be6f0dd83a967e1119cf732.tar.gz qtbase-a2d3b7c99165cb5c4be6f0dd83a967e1119cf732.tar.bz2 qtbase-a2d3b7c99165cb5c4be6f0dd83a967e1119cf732.zip | |
Move the glxfbconfig configtest to qpa and rename it to glx
We require glx version 1.3 which is where fbconfig is first defined.
Also make use of the configure test and report the glx status.
GLX support should always take precedence when compiling the
xcb backend
Change-Id: Ie46834210bf5cd2ac4006ff08379e0d3434ffa2b
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/qpa/glx/glx.cpp (renamed from config.tests/x11/glxfbconfig/glxfbconfig.cpp) | 1 | ||||
| -rw-r--r-- | config.tests/qpa/glx/glx.pro (renamed from config.tests/x11/glxfbconfig/glxfbconfig.pro) | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config.tests/x11/glxfbconfig/glxfbconfig.cpp b/config.tests/qpa/glx/glx.cpp index 77bedb41c8..03af3f6131 100644 --- a/config.tests/x11/glxfbconfig/glxfbconfig.cpp +++ b/config.tests/qpa/glx/glx.cpp @@ -44,6 +44,7 @@ int main(int, char **) { + //We require glxfbconfig, ie. glx 1.3 GLXFBConfig config; config = 0; diff --git a/config.tests/x11/glxfbconfig/glxfbconfig.pro b/config.tests/qpa/glx/glx.pro index 65f855a5f2..da51a6d231 100644 --- a/config.tests/x11/glxfbconfig/glxfbconfig.pro +++ b/config.tests/qpa/glx/glx.pro @@ -1,4 +1,4 @@ -SOURCES = glxfbconfig.cpp +SOURCES = glx.cpp CONFIG += x11 INCLUDEPATH += $$QMAKE_INCDIR_OPENGL |