summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
m---------src/3rdparty0
-rw-r--r--src/core/config/linux.pri2
2 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 168cc2b83c53e4e68bf89b331d92da88a99d2bf
+Subproject ba36da6c1f59da7687f6924cc558105dcd1c44d
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
index 8854a4bdf..b579e2a3f 100644
--- a/src/core/config/linux.pri
+++ b/src/core/config/linux.pri
@@ -29,6 +29,8 @@ use?(nss) {
use_openssl_certs=1
}
+gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): GYP_CONFIG += v8_no_delete_null_pointer_checks=1
+
contains(QT_CONFIG, system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1
contains(QT_CONFIG, system-png): GYP_CONFIG += use_system_libpng=1
contains(QT_CONFIG, system-jpeg): GYP_CONFIG += use_system_libjpeg=1