diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-06-11 14:08:23 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-06-12 06:07:49 +0200 |
| commit | fdd26164ba4aaf9a94cec74e5e9bd5f5a8efe3ae (patch) | |
| tree | c6a0e8bd158860433167acc5e87fc54da58c17d6 /src/buildtools | |
| parent | e906437f33e760dcfbdc58bc6f6fe78a51677918 (diff) | |
Do not build on qnx
It seems that coin on qt5 merge tries to build qtpdf on qnx
Change-Id: Ife42dbf0484b1f0151e9c487467898c5c2567c4a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/config/support.pri | 15 | ||||
| -rw-r--r-- | src/buildtools/configure.json | 3 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri index 6768f0a15..80f291500 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri @@ -5,10 +5,7 @@ defineTest(qtwebengine_skipBuild) { # this should match webengine-core-support defineReplace(qtwebengine_checkWebEngineCoreError) { - !linux:!win32:!macos { - qtwebengine_skipBuild("QtWebEngine can be build only on Linux, Windows or macOS.") - return(false) - } + !qtwebengine_checkForBuildSupport(QtWebEngine):return(false) static { qtwebengine_skipBuild("Static builds of QtWebEngine are not supported.") return(false) @@ -38,6 +35,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { # this shuold match webengine-qtpdf-support defineReplace(qtwebengine_checkPdfError) { + !qtwebengine_checkForBuildSupport(QtPdf):return(false) !qtwebengine_checkForGui(QtPdf):return(false) !qtwebengine_checkForSubmodule(QtPdf):return(false) !qtwebengine_checkForWhiteSpace(QtPdf):return(false) @@ -54,6 +52,15 @@ 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 96727a148..e59757a69 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -383,7 +383,8 @@ }, "webengine-qtpdf-support": { "label": "Support Qt Pdf", - "condition": "module.gui + "condition": "(config.linux || config.win32 || config.macos) + && module.gui && features.webengine-submodule && features.webengine-nowhitespace && !features.webengine-no-platform-support |