diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-24 12:32:08 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-11-24 12:32:39 +0100 |
| commit | f2f20462e146508868d488f9bc370c53e000d2d9 (patch) | |
| tree | 52022ca4c648807543ae2b8f48421b2e5a6df7d6 /src/core/config | |
| parent | b4f8480fd41a806abe04e8eb2a4c416b2eff53c6 (diff) | |
| parent | ecfb3ba8a7eb116c838a1acd5b82ca59ce76b082 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Ib2a1eb4dfae2fb5a98066d3d0f8f09f4e1d61d3f
Diffstat (limited to 'src/core/config')
| -rw-r--r-- | src/core/config/common.pri | 5 | ||||
| -rw-r--r-- | src/core/config/desktop_linux.pri | 6 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri index 01c942976..7a9656fca 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -10,3 +10,8 @@ GYP_CONFIG += v8_use_external_startup_data=0 GYP_CONFIG += enable_web_speech=0 # We do not use or even include the extensions GYP_CONFIG += enable_extensions=0 + +sanitize_address: GYP_CONFIG += asan=1 +sanitize_thread: GYP_CONFIG += tsan=1 +sanitize_memory: GYP_CONFIG += msan=1 +sanitize_undefined: GYP_CONFIG += ubsan=1 diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri index 46d500207..e28d7eb7c 100644 --- a/src/core/config/desktop_linux.pri +++ b/src/core/config/desktop_linux.pri @@ -8,7 +8,11 @@ GYP_CONFIG += \ enable_pdf=1 clang { - GYP_CONFIG += clang=1 host_clang=1 clang_use_chrome_plugins=0 make_clang_dir=/usr + GYP_CONFIG += werror= + clang_full_path = $$which($${QMAKE_CXX}) + # Remove the "/bin/clang++" part. + clang_prefix = $$section(clang_full_path, /, 0, -3) + GYP_CONFIG += clang=1 host_clang=1 clang_use_chrome_plugins=0 make_clang_dir=$${clang_prefix} linux-clang-libc++: GYP_CONFIG += use_system_libcxx=1 } else { GYP_CONFIG += clang=0 host_clang=0 diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index fc2b124fb..83c852f86 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -39,7 +39,7 @@ gcc:!clang: greaterThan(QT_GCC_MAJOR_VERSION, 5): GYP_CONFIG += no_delete_null_p qtConfig(system-zlib): use?(system_minizip): GYP_CONFIG += use_system_zlib=1 qtConfig(system-png): GYP_CONFIG += use_system_libpng=1 qtConfig(system-jpeg): GYP_CONFIG += use_system_libjpeg=1 -qtConfig(system-harfbuzz): GYP_CONFIG += use_system_harfbuzz=1 +qtConfig(system-harfbuzz): use?(system_harfbuzz): GYP_CONFIG += use_system_harfbuzz=1 !qtConfig(glib): GYP_CONFIG += use_glib=0 contains(QT_CONFIG, pulseaudio) { GYP_CONFIG += use_pulseaudio=1 |