diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-05-20 14:47:45 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-05-28 11:06:36 +0200 |
| commit | f79694b899c425395146f85be02344ba50a2fd8b (patch) | |
| tree | 553f506f87d4a5d98780e8b3c73eebfe6f1c66ca /src/buildtools | |
| parent | f2db8f1988a3767d4f35aa4724d4e168e80dad59 (diff) | |
Add missing checks to configure
During tossing wip-qtpdf across 5.14 and 5.15
some checks got skipped. Fix configuration.
We share error messages between configure
and make steps.
Change-Id: I15e4a66adc62f06c403487c8a4eb8925ce260447
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/config/support.pri | 1 | ||||
| -rw-r--r-- | src/buildtools/configure.json | 23 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri index 8077b12ff..51ed0e42e 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri @@ -4,6 +4,7 @@ defineTest(qtwebengine_skipBuild) { export(skipBuildReason) } +# this should match webengine-core-support defineReplace(qtwebengine_checkError) { !qtHaveModule(gui) { diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index ec0ca5c5d..8c09601c4 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -350,19 +350,26 @@ "webengine-core-support": { "label": "Support Qt WebEngine Core", "condition": "module.gui - && features.webengine-python2 - && features.webengine-gperf - && features.webengine-bison - && features.webengine-flex && features.webengine-submodule && features.webengine-nowhitespace - && features.webengine-arch-support && !features.webengine-no-platform-support + && features.webengine-arch-support + && features.webengine-gperf + && features.webengine-bison + && features.webengine-flex + && features.webengine-python2 && !config.static + && !config.ios && (!config.linux || features.pkg-config) - && (!features.xcb || features.webengine-ozone-x11) - && (!config.win32 || features.webengine-winversion) - && !config.ios", + && (!config.linux || features.webengine-host-pkg-config) + && (!config.linux || features.webengine-system-glibc) + && (!config.linux || features.webengine-system-khr) + && (!config.linux || features.webengine-system-nss) + && (!config.linux || features.webengine-system-dbus) + && (!config.linux || features.webengine-system-fontconfig) + && (!config.linux || !features.pkg-config || !features.xcb || features.webengine-ozone-x11) + && (!config.win32 || features.webengine-win-compiler64) + && (!config.win32 || features.webengine-winversion)", "output": [ "privateFeature" ] }, "webengine-qtpdf-support": { |