summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2017-12-22 13:50:45 +0100
committerMichal Klocek <michal.klocek@qt.io>2018-01-02 10:52:31 +0000
commit6f242a9389369242b23a61dcb59fc610dc27bb05 (patch)
treed802bd32c814a2c63e5c7ec4535e219e3beca6f6
parent17ecc4e7e0c88d891e1b18d5810a7ac2fd0b83ba (diff)
Remove QT_LIBDIR_EGL/GLES2 leftovers
Since e812237b69 we do not longer use QT_LIBDIR_EGL and QT_LIBDIR_GLES2 to dynamically load gl libraries. Remove leftovers from gn generator. Task-number: QTBUG-65442 Change-Id: I045242b49be411373d36eb9c333916d27b0f169d Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
-rw-r--r--mkspecs/features/gn_generator.prf11
1 files changed, 0 insertions, 11 deletions
diff --git a/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf
index 072b0444e..a54a96c5a 100644
--- a/mkspecs/features/gn_generator.prf
+++ b/mkspecs/features/gn_generator.prf
@@ -148,17 +148,6 @@ for (define, DEFINES): {
define = $$replace(define,\',)
GN_CONTENTS += " \"$$define\","
}
-!isEmpty(QT_SYSROOT) {
- !isEmpty(QMAKE_LIBDIR_EGL):
- GN_CONTENTS += " \"QT_LIBDIR_EGL=\\\"$${QMAKE_DIR_SEP}$$relative_path($$QMAKE_LIBDIR_EGL, $$[QT_SYSROOT])\\\"\","
- !isEmpty(QMAKE_LIBDIR_OPENGL_ES2)
- GN_CONTENTS += " \"QT_LIBDIR_GLES2=\\\"$${QMAKE_DIR_SEP}$$relative_path($$QMAKE_LIBDIR_OPENGL_ES2, $$[QT_SYSROOT])\\\"\","
-} else {
- !isEmpty(QMAKE_LIBDIR_EGL):
- GN_CONTENTS += " \"QT_LIBDIR_EGL=\\\"$$QMAKE_LIBDIR_EGL\\\"\","
- !isEmpty(QMAKE_LIBDIR_OPENGL_ES2)
- GN_CONTENTS += " \"QT_LIBDIR_GLES2=\\\"$$QMAKE_LIBDIR_OPENGL_ES2\\\"\","
-}
GN_CONTENTS += " ]"
# Source files to compile