Fix brcm_egl test to not link against Qt

Change-Id: I734d9f6b1120f5d0d5751069c6b6f551172aca50
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>

diff --git a/config.tests/brcm_egl/brcm_egl.pro b/config.tests/brcm_egl/brcm_egl.pro
index 78175ed..a6b416f 100644 (file)
--- a/config.tests/brcm_egl/brcm_egl.pro
+++ b/config.tests/brcm_egl/brcm_egl.pro
@@ -1,7 +1,13 @@
 TARGET = brcm_egl
-QT = core gui
+CONFIG -= qt
 
-LIBS += -lEGL -lGLESv2
+INCLUDEPATH += $$QMAKE_INCDIR_EGL
+
+for(p, QMAKE_LIBDIR_EGL) {
+    exists($$p):LIBS += -L$$p
+}
+
+LIBS += $$QMAKE_LIBS_EGL
 
 # Input
 SOURCES += main.cpp

diff --git a/config.tests/brcm_egl/main.cpp b/config.tests/brcm_egl/main.cpp
index ca43df0..25665bb 100644 (file)
--- a/config.tests/brcm_egl/main.cpp
+++ b/config.tests/brcm_egl/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <qglobal.h>
+#include <stdio.h>
 
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
@@ -49,11 +49,16 @@
 int main()
 {
     EGLDisplay display = eglGetDisplay((EGLNativeDisplayType)EGL_DEFAULT_DISPLAY);
-    if (!display)
-        qFatal("No EGL display");
+    if (!display) {
+        fprintf(stderr, "No EGL display");
+        return -1;
+    }
+
     EGLint major, minor;
-    if (!eglInitialize(display, &major, &minor))
-        qFatal("Failed to initialize EGL");
+    if (!eglInitialize(display, &major, &minor)) {
+        fprintf(stderr, "Failed to initialize EGL");
+        return -1;
+    }
 
     EGLint pixel_format = EGL_PIXEL_FORMAT_ARGB_8888_BRCM;