diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-08-22 11:19:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-09-17 17:01:42 +0000 |
| commit | 1de18504fa524a49dffe808164fe8f8187b4ffab (patch) | |
| tree | 57857e885cc5f168a680ee21a9d014f9178c5500 /src | |
| parent | f03cd06d89ceba2b99ffb9c4ca911dc01f0bdb08 (diff) | |
Add platform and architecture to configure
Make configure system aware of platform and architecture
checks.
Task-number: QTBUG-75840
Task-number: QTBUG-76606
Change-Id: I8d2c9dd863ee2c4a3015ad8147f43dc788cfd72d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/buildtools/configure.json | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index 3fc342992..62a9368ee 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -351,6 +351,14 @@ "webengine-win-compiler64": { "label": "64bit compiler", "type": "isWindowsHostCompiler64" + }, + "webengine-platform": { + "label": "platform supported", + "type": "detectPlatform" + }, + "webengine-architecture": { + "label": "architecture supported", + "type": "detectArch" } }, "features": { @@ -362,7 +370,9 @@ && features.webengine-gperf && features.webengine-bison && features.webengine-flex - && (!features.xcb || features.webengine-ozone-x11)", + && (!features.xcb || features.webengine-ozone-x11) + && tests.webengine-platform + && tests.webengine-architecture", "output": [ "privateFeature" ] }, "webengine-python2": { @@ -650,6 +660,16 @@ "type": "warning", "condition": "config.win32 && !features.webengine-win-compiler64", "message": "64-bit cross-building or native toolchain is required to build QtWebEngine." + }, + { + "type": "skipBuildWarning", + "condition": "tests.webengine-platform", + "message": "isPlatformSupported" + }, + { + "type": "skipBuildWarning", + "condition": "tests.webengine-architecture", + "message": "isArchSupported" } ], "summary": [ |