diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-03 19:10:09 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-10 15:43:25 +0000 |
commit | 4f8b40d74e1840f9e9c266dd86bdd907d2959287 (patch) | |
tree | 26b07b4a38a21a9bebffc4a776629346a82e736e /config.tests | |
parent | 1e6b403ecc8aa4ab34c1516f503d926b60d0d785 (diff) |
make the egl-viv and egl-brcm config tests less convoluted
don't mix in gles2 stuff, and rely on the library definitions from the
mkspec.
Change-Id: Id81b27a8c4f24729866d3ceb5cf97b443def542c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'config.tests')
-rw-r--r-- | config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp | 1 | ||||
-rw-r--r-- | config.tests/qpa/eglfs-viv/eglfs-viv.cpp | 1 | ||||
-rw-r--r-- | config.tests/qpa/eglfs-viv/eglfs-viv.pro | 4 |
3 files changed, 1 insertions, 5 deletions
diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp b/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp index 8a46ec9fff..e6ba06f89b 100644 --- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp +++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include <EGL/egl.h> -#include <GLES2/gl2.h> #include <bcm_host.h> int main(int, char **) diff --git a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp b/config.tests/qpa/eglfs-viv/eglfs-viv.cpp index 96935a2aa0..e6e17919dc 100644 --- a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp +++ b/config.tests/qpa/eglfs-viv/eglfs-viv.cpp @@ -39,7 +39,6 @@ #include <EGL/egl.h> #include <EGL/eglvivante.h> -#include <GLES2/gl2.h> int main(int, char **) { diff --git a/config.tests/qpa/eglfs-viv/eglfs-viv.pro b/config.tests/qpa/eglfs-viv/eglfs-viv.pro index 3b36dc533f..1617ee38ad 100644 --- a/config.tests/qpa/eglfs-viv/eglfs-viv.pro +++ b/config.tests/qpa/eglfs-viv/eglfs-viv.pro @@ -6,9 +6,7 @@ integrity { } CONFIG -= qt -LIBS += -lEGL -lGLESv2 -lGAL - -for(p, QMAKE_LIBDIR_OPENGL_ES2) { +for(p, QMAKE_LIBDIR_OPENGL_EGL) { exists($$p):LIBS += -L$$p } |