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-12-13 16:50:41 +0100 |
| commit | 41495c1d36e6552f7333ef3ed3b345801cd77318 (patch) | |
| tree | 41c74af0b4a799fb7832c1e5fb5b73d832ccf996 /chromium/third_party | |
| parent | f589d5d91e006e7537b169e6a235ff1255928f99 (diff) | |
| download | qtwebengine-chromium-41495c1d36e6552f7333ef3ed3b345801cd77318.tar.gz | |
Fix ios compilation issues
Task-number: QTBUG-88614
Change-Id: I558946624df8e349edb5f07ad4be427ac9cfe234
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party')
| -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 40102305163..d1f8074a57d 100644 --- a/chromium/third_party/pdfium/core/fpdfapi/font/cpdf_type1font.cpp +++ b/chromium/third_party/pdfium/core/fpdfapi/font/cpdf_type1font.cpp @@ -19,7 +19,7 @@ #include "core/fxge/freetype/fx_freetype.h" #include "core/fxge/fx_font.h" -#if BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_IOS) #include <Carbon/Carbon.h> #endif // BUILDFLAG(IS_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 4cd6ed060dd..8a88bcf897d 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 @@ -25,6 +25,10 @@ #include "core/fxge/text_char_pos.h" #include "third_party/base/span.h" +#if defined(OS_IOS) +#include <CoreGraphics/CoreGraphics.h> +#endif + namespace { void DoNothing(void* info, const void* data, size_t size) {} |