summaryrefslogtreecommitdiff
path: root/config.tests
diff options
context:
space:
mode:
authorAndy Nichols <andy.nichols@nokia.com>2012-07-18 14:00:30 +0200
committerJørgen Lind <jorgen.lind@nokia.com>2012-07-19 09:06:23 +0200
commit3c8c70c34ca50f570809dd7b25685fd015495a7c (patch)
tree22907195b4892f01a3f4dec481e7d542dd2dd521 /config.tests
parent573e9d53f470f9edbc40a21bec86afd39b1c2797 (diff)
downloadqtwayland-3c8c70c34ca50f570809dd7b25685fd015495a7c.tar.gz
Fix brcm_egl test to not link against Qt
Change-Id: I734d9f6b1120f5d0d5751069c6b6f551172aca50 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'config.tests')
-rw-r--r--config.tests/brcm_egl/brcm_egl.pro10
-rw-r--r--config.tests/brcm_egl/main.cpp15
2 files changed, 18 insertions, 7 deletions
diff --git a/config.tests/brcm_egl/brcm_egl.pro b/config.tests/brcm_egl/brcm_egl.pro
index 78175ed8..a6b416f1 100644
--- 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 ca43df0d..25665bb0 100644
--- 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;