From 2693ca59e197651c05934daaf2b29e7386746140 Mon Sep 17 00:00:00 2001 From: Donald Carr Date: Wed, 30 Mar 2016 10:35:51 -0700 Subject: [PATCH] Adjust egl config.test to pass sysrooted libs We should really start using -L=/foo and -I=/foo inside of sysroots, this test was preventing us from doing so (while arguably buying us nothing). Change-Id: If6e67631c585493871231e5d8a9354fa72e07343 Reviewed-by: Laszlo Agocs Reviewed-by: Oswald Buddenhagen --- config.tests/qpa/egl-x11/egl-x11.pro | 2 +- config.tests/qpa/egl/egl.pro | 2 +- config.tests/qpa/eglfs-brcm/eglfs-brcm.pro | 2 +- config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro | 2 +- config.tests/unix/opengles2/opengles2.pro | 2 +- config.tests/unix/opengles3/opengles3.pro | 2 +- config.tests/unix/opengles31/opengles31.pro | 2 +- mkspecs/features/egl.prf | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config.tests/qpa/egl-x11/egl-x11.pro b/config.tests/qpa/egl-x11/egl-x11.pro index c4e94ca40c5..aceb03dd783 100644 --- a/config.tests/qpa/egl-x11/egl-x11.pro +++ b/config.tests/qpa/egl-x11/egl-x11.pro @@ -1,7 +1,7 @@ SOURCES = egl-x11.cpp for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS += -L$$p + LIBS += -L$$p } !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL diff --git a/config.tests/qpa/egl/egl.pro b/config.tests/qpa/egl/egl.pro index f04d053543f..b5396dab155 100644 --- a/config.tests/qpa/egl/egl.pro +++ b/config.tests/qpa/egl/egl.pro @@ -1,7 +1,7 @@ SOURCES = egl.cpp for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS += -L$$p + LIBS += -L$$p } !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro index ce16a3a3911..d8b1c3ec7e1 100644 --- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro +++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro @@ -5,7 +5,7 @@ CONFIG -= qt INCLUDEPATH += $$QMAKE_INCDIR_EGL for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS += -L$$p + LIBS += -L$$p } LIBS += -lEGL -lGLESv2 -lbcm_host diff --git a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro index 87214abc7a9..521a9112199 100644 --- a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro +++ b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro @@ -1,7 +1,7 @@ SOURCES = eglfs-egldevice.cpp for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS += -L$$p + LIBS += -L$$p } INCLUDEPATH += $$QMAKE_INCDIR_EGL diff --git a/config.tests/unix/opengles2/opengles2.pro b/config.tests/unix/opengles2/opengles2.pro index c4d76895a87..da30b453c65 100644 --- a/config.tests/unix/opengles2/opengles2.pro +++ b/config.tests/unix/opengles2/opengles2.pro @@ -2,7 +2,7 @@ SOURCES = opengles2.cpp INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 for(p, QMAKE_LIBDIR_OPENGL_ES2) { - exists($$p):LIBS += -L$$p + LIBS += -L$$p } CONFIG -= qt diff --git a/config.tests/unix/opengles3/opengles3.pro b/config.tests/unix/opengles3/opengles3.pro index 6942b573279..720985f14db 100644 --- a/config.tests/unix/opengles3/opengles3.pro +++ b/config.tests/unix/opengles3/opengles3.pro @@ -6,7 +6,7 @@ SOURCES = opengles3.cpp INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 for(p, QMAKE_LIBDIR_OPENGL_ES2) { - exists($$p):LIBS += -L$$p + LIBS += -L$$p } CONFIG -= qt diff --git a/config.tests/unix/opengles31/opengles31.pro b/config.tests/unix/opengles31/opengles31.pro index 1df9cedfcd0..225180e1c69 100644 --- a/config.tests/unix/opengles31/opengles31.pro +++ b/config.tests/unix/opengles31/opengles31.pro @@ -6,7 +6,7 @@ SOURCES = opengles31.cpp INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 for(p, QMAKE_LIBDIR_OPENGL_ES2) { - exists($$p):LIBS += -L$$p + LIBS += -L$$p } CONFIG -= qt diff --git a/mkspecs/features/egl.prf b/mkspecs/features/egl.prf index c3bdd9fdf45..9fa0c9e219b 100644 --- a/mkspecs/features/egl.prf +++ b/mkspecs/features/egl.prf @@ -4,5 +4,5 @@ QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EGL LIBS += $$QMAKE_LFLAGS_EGL for(p, QMAKE_LIBDIR_EGL) { - exists($$p): LIBS_PRIVATE += -L$$p + LIBS_PRIVATE += -L$$p }