From 4f8b40d74e1840f9e9c266dd86bdd907d2959287 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Wed, 3 Aug 2016 19:10:09 +0200
Subject: 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>
---
 config.tests/qpa/eglfs-brcm/eglfs-brcm.cpp | 1 -
 config.tests/qpa/eglfs-viv/eglfs-viv.cpp   | 1 -
 config.tests/qpa/eglfs-viv/eglfs-viv.pro   | 4 +---
 3 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'config.tests')

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
 }
 
-- 
cgit v1.2.3