diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-20 13:38:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-20 18:27:44 +0200 |
| commit | 25ccef35eb19fd656eba2a7abe5419972ed28552 (patch) | |
| tree | e0c92532c3c70135d0a547675414e95d21a66822 /src/core/config | |
| parent | 3398abfc1b5b789d11592aada0b5860e36a50041 (diff) | |
| parent | e91f09947b55dda8a13b2aeb0963836dee2ece8d (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/3rdparty
src/core/permission_manager_qt.cpp
src/core/renderer/web_channel_ipc_transport.cpp
src/core/renderer/web_channel_ipc_transport.h
Change-Id: I25fd8ed7c433dadce44d8ac1e39f86e211ec25f0
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/linux.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index fcbdbe27a..a71d36c53 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -33,6 +33,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 |