summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/egl/egl.pri2
-rw-r--r--src/opengl/opengl.pro10
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 \