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 /mkspecs | |
| 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 'mkspecs')
| -rw-r--r-- | mkspecs/features/functions.prf | 9 | ||||
| -rw-r--r-- | mkspecs/features/platform.prf | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index ec78a59cb..7617005ea 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -104,8 +104,8 @@ defineTest(skipBuild) { defineTest(isWebEngineCoreBuild) { - static{ - skipBuild("Static builds of QtWebEngine aren't supported.") + static { + skipBuild("Static builds of QtWebEngine are not supported.") return(false) } @@ -149,6 +149,11 @@ defineTest(isWebEngineCoreBuild) { return(false) } + win32:!qtConfig(webengine-winversion) { + skipBuild("Needs Visual Studio 2017 or higher") + return(false) + } + !qtConfig(webengine-gperf) { skipBuild("Required gperf could not be found.") return(false) diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf index 23260cc79..05854d90f 100644 --- a/mkspecs/features/platform.prf +++ b/mkspecs/features/platform.prf @@ -1,6 +1,3 @@ -include($$QTWEBENGINE_OUT_ROOT/src/buildtools/qtbuildtools-config.pri) -QT_FOR_CONFIG += buildtools-private - defineTest(isQtMinimum) { !equals(QT_MAJOR_VERSION, $$1): return(false) count(ARGS, 1, greaterThan) { @@ -39,10 +36,6 @@ defineTest(isWindowsPlatformSupported) { skipBuild("Qt WebEngine on Windows requires a Windows SDK version 10.0.17763 or newer.") return(false) } - !qtConfig(webengine-winversion) { - skipBuild("Needs Visual Studio 2017 or higher") - return(false) - } return(true) } |