From 6f242a9389369242b23a61dcb59fc610dc27bb05 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 22 Dec 2017 13:50:45 +0100 Subject: 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 --- mkspecs/features/gn_generator.prf | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'mkspecs/features/gn_generator.prf') 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 -- cgit v1.2.3