From 6f242a9389369242b23a61dcb59fc610dc27bb05 Mon Sep 17 00:00:00 2001
From: Michal Klocek <michal.klocek@qt.io>
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 <viktor.engelmann@qt.io>
---
 mkspecs/features/gn_generator.prf | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'mkspecs')

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


From 0b406584b711e5c6e12baeb15e10045f02914af4 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Thu, 14 Dec 2017 12:45:44 +0100
Subject: Fix sanitizer build

Task-number: QTBUG-64726
Change-Id: Ic88eed62e85ad1d95afcbd154c6556509e42bd47
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 mkspecs/features/configure.prf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
index 904e7b1c0..8b8fd3efe 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -48,7 +48,7 @@ defineTest(runConfigure) {
     }
 
     sanitizer: !qtConfig(webengine-sanitizer) {
-        skipBuild("Chosen sanitizer configuration is not supported. Use --feature-webengine-sanitizer=yes to force build with the chosen sanitizer configuration.")
+        skipBuild("Chosen sanitizer configuration is not supported. Check config.log for details or use -feature-webengine-sanitizer to force build with the chosen sanitizer configuration.")
         return(false);
     }
 
-- 
cgit v1.2.3