diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-07-17 17:11:11 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-07-21 20:08:35 +0200 |
| commit | 1de4c8077246dd0443aa16ecdbafd8859f218d3c (patch) | |
| tree | cd3891b806eff04c6c726d03f5c4e5775eeab6b3 | |
| parent | aebb900f87d6a05c473726f7e2388fe915f5dbd9 (diff) | |
Fix platform support for qtpdf on ios
Add missing check for ios.
Change-Id: I7fce6addb154ea83b8308094d5a6c4275d050d9b
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/buildtools/config/support.pri | 19 | ||||
| -rw-r--r-- | src/buildtools/configure.json | 2 | ||||
| -rw-r--r-- | src/pdf/config/ios.pri | 1 |
3 files changed, 9 insertions, 13 deletions
diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri index 80f291500..e192f8777 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri @@ -5,7 +5,10 @@ defineTest(qtwebengine_skipBuild) { # this should match webengine-core-support defineReplace(qtwebengine_checkWebEngineCoreError) { - !qtwebengine_checkForBuildSupport(QtWebEngine):return(false) + !linux:!win32:!macos { + qtwebengine_skipBuild("QtWebEngine can be built only on Linux, Windows or macOS.") + return(false) + } static { qtwebengine_skipBuild("Static builds of QtWebEngine are not supported.") return(false) @@ -35,7 +38,10 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { # this shuold match webengine-qtpdf-support defineReplace(qtwebengine_checkPdfError) { - !qtwebengine_checkForBuildSupport(QtPdf):return(false) + !linux:!win32:!macos:!ios { + qtwebengine_skipBuild("QtPdf can be built only on Linux, Windows, macOS or iOS.") + return(false) + } !qtwebengine_checkForGui(QtPdf):return(false) !qtwebengine_checkForSubmodule(QtPdf):return(false) !qtwebengine_checkForWhiteSpace(QtPdf):return(false) @@ -52,15 +58,6 @@ defineReplace(qtwebengine_checkPdfError) { return(true) } -defineTest(qtwebengine_checkForBuildSupport) { - module = $$1 - !linux:!win32:!macos { - qtwebengine_skipBuild("$${module} can be build only on Linux, Windows or macOS.") - return(false) - } - return(true) -} - defineTest(qtwebengine_checkForGui) { module = $$1 !qtHaveModule(gui) { diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index e59757a69..a4c9b1776 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -383,7 +383,7 @@ }, "webengine-qtpdf-support": { "label": "Support Qt Pdf", - "condition": "(config.linux || config.win32 || config.macos) + "condition": "(config.linux || config.win32 || config.macos || config.ios) && module.gui && features.webengine-submodule && features.webengine-nowhitespace diff --git a/src/pdf/config/ios.pri b/src/pdf/config/ios.pri index 5dc7faf9d..1dcbeffde 100644 --- a/src/pdf/config/ios.pri +++ b/src/pdf/config/ios.pri @@ -26,7 +26,6 @@ use_allocator_shim=false \ use_allocator=\"none\" \ use_custom_libcxx=false \ v8_use_external_startup_data=false \ -v8_use_snapshot=false \ toolkit_views=false \ treat_warnings_as_errors=false \ safe_browsing_mode=0 \ |