From 494dac682bb34521d9b5191ede30534882f64286 Mon Sep 17 00:00:00 2001 From: Tatiana Borisova Date: Fri, 18 Jun 2021 14:58:05 +0300 Subject: Fix harfbuzz-ng compilation for Integrity Add --restrict definition, because GHS compiler doesn't support it by default Change-Id: I6766f2fe309802ad9de333edd6ed43f7a187616f Reviewed-by: Alexandru Croitor (cherry picked from commit 22a058bcf03a706297ea9484bda0d8331c4c05d5) Reviewed-by: Qt Cherry-pick Bot --- src/3rdparty/harfbuzz-ng/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt index 5ac9b33b62..966cc09d36 100644 --- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt @@ -65,6 +65,12 @@ qt_internal_add_3rdparty_library(BundledHarfbuzz PUBLIC_INCLUDE_DIRECTORIES $ ) + +# GHS compiler doesn't support the __restrict keyword +if(INTEGRITY) + target_compile_definitions(BundledHarfbuzz PRIVATE __restrict=) +endif() + qt_disable_warnings(BundledHarfbuzz) qt_set_symbol_visibility_hidden(BundledHarfbuzz) -- cgit v1.2.3