diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2022-01-25 12:02:19 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-02-25 10:43:56 +0100 |
| commit | 3327811c6d2280cbf9d4bacaedc78c2c35926512 (patch) | |
| tree | 2a05de3e3b4758cd077af03ae8f5b9944a7308fd | |
| parent | cb2ccec89ef0f196818fc6920bd228cbd22bd419 (diff) | |
| download | qtwebengine-chromium-3327811c6d2280cbf9d4bacaedc78c2c35926512.tar.gz | |
Fix ios compilation issues
Task-number: QTBUG-88614
Change-Id: I558946624df8e349edb5f07ad4be427ac9cfe234
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/third_party/pdfium/core/fpdfapi/font/cpdf_type1font.cpp | 2 | ||||
| -rw-r--r-- | chromium/third_party/pdfium/core/fxge/apple/fx_apple_impl.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/chromium/third_party/pdfium/core/fpdfapi/font/cpdf_type1font.cpp b/chromium/third_party/pdfium/core/fpdfapi/font/cpdf_type1font.cpp index f275507e3d8..61da82d49cf 100644 --- a/chromium/third_party/pdfium/core/fpdfapi/font/cpdf_type1font.cpp +++ b/chromium/third_party/pdfium/core/fpdfapi/font/cpdf_type1font.cpp @@ -18,7 +18,7 @@ #include "core/fxge/fx_font.h" #include "core/fxge/fx_freetype.h" -#if defined(OS_APPLE) +#if defined(OS_APPLE) && !defined(OS_IOS) #include <Carbon/Carbon.h> #endif // defined(OS_APPLE) diff --git a/chromium/third_party/pdfium/core/fxge/apple/fx_apple_impl.cpp b/chromium/third_party/pdfium/core/fxge/apple/fx_apple_impl.cpp index fbd039ee317..018cfa3a99e 100644 --- a/chromium/third_party/pdfium/core/fxge/apple/fx_apple_impl.cpp +++ b/chromium/third_party/pdfium/core/fxge/apple/fx_apple_impl.cpp @@ -22,6 +22,10 @@ #include "core/fxge/text_char_pos.h" #include "third_party/base/span.h" +#if defined(OS_IOS) +#include <CoreGraphics/CoreGraphics.h> +#endif + #if !defined(_SKIA_SUPPORT_) #include "core/fxge/agg/fx_agg_driver.h" #endif |