From 486ff054b8b65c191df39748dfe59f9440a60578 Mon Sep 17 00:00:00 2001 From: Tom Cooksey Date: Tue, 8 Sep 2009 12:46:56 +0200 Subject: Make QtOpenGL link against EGL for OpenGL ES Previously, QtOpenGL assumed that by linking against QtGui, it would automatically also be linked against EGL. However, this is no longer the case after 83940f25dba51a9942ab55ed8475fc7fc8a8da84 which makes sure only QtGui links against EGL and not other libs/apps linking against QtGui. Reviewed-by: Rhys Weatherley --- src/gui/egl/egl.pri | 2 +- src/opengl/opengl.pro | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri index 75a3d91..22c8bd7 100644 --- a/src/gui/egl/egl.pri +++ b/src/gui/egl/egl.pri @@ -21,7 +21,7 @@ unix { } for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS += -L$$p + exists($$p):LIBS_PRIVATE += -L$$p } !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index d479c2e..da30e3d 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -13,9 +13,17 @@ include(../qbase.pri) !win32:!embedded:!mac:CONFIG += x11 contains(QT_CONFIG, opengl):CONFIG += opengl contains(QT_CONFIG, opengles1):CONFIG += opengles1 -contains(QT_CONFIG, opengles1):CONFIG += opengles1cl +contains(QT_CONFIG, opengles1cl):CONFIG += opengles1cl contains(QT_CONFIG, opengles2):CONFIG += opengles2 +contains(QT_CONFIG, opengles.*) { + for(p, QMAKE_LIBDIR_EGL) { + exists($$p):LIBS_PRIVATE += -L$$p + } + !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL + !isEmpty(QMAKE_LIBS_EGL): LIBS_PRIVATE += $$QMAKE_LIBS_EGL +} + HEADERS += qgl.h \ qgl_p.h \ qglcolormap.h \ -- cgit v0.12