diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-09-08 10:46:56 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-09-09 15:16:17 (GMT) |
| commit | 486ff054b8b65c191df39748dfe59f9440a60578 (patch) | |
| tree | 11eb758e7c1df1ac2e396e75ef69d2528e041b2a /src | |
| parent | b8a6c69d7e2a8bcfc7c5e11784e0c6efee86caf4 (diff) | |
| download | Qt-486ff054b8b65c191df39748dfe59f9440a60578.zip Qt-486ff054b8b65c191df39748dfe59f9440a60578.tar.gz Qt-486ff054b8b65c191df39748dfe59f9440a60578.tar.bz2 | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/egl/egl.pri | 2 | ||||
| -rw-r--r-- | 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 \ |