diff options
| author | Tatiana Borisova <tatiana.borisova@qt.io> | 2021-06-18 14:58:05 +0300 |
|---|---|---|
| committer | Tatiana Borisova <tatiana.borisova@qt.io> | 2021-06-28 15:36:25 +0300 |
| commit | 22a058bcf03a706297ea9484bda0d8331c4c05d5 (patch) | |
| tree | d0039137b34dbdedbbef06d51d8b09e2f128cb9b /src/3rdparty/harfbuzz-ng | |
| parent | 0c09f4489d8a97b8fb47afebf15937398752f23d (diff) | |
Fix harfbuzz-ng compilation for Integrity
Add --restrict definition, because GHS compiler doesn't support it by default
Pick-to: 6.2
Change-Id: I6766f2fe309802ad9de333edd6ed43f7a187616f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/3rdparty/harfbuzz-ng')
| -rw-r--r-- | src/3rdparty/harfbuzz-ng/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
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 $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/harfbuzz> ) + +# 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) |