diff options
author | Michal Klocek <michal.klocek@qt.io> | 2017-09-13 18:10:18 +0200 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2017-09-19 07:51:06 +0000 |
commit | bd97ecd3f617b21fa56a2717abcf76518697b1e3 (patch) | |
tree | dbeac6d0fddbd2432f87df23ab21085ba912508c /mkspecs/features/configure.prf | |
parent | 6347e3195c6934c0f3aa4668a55a285336dd407a (diff) |
Cleanup skipBuild code
Move all skipBuild related checks to runConfigure()
in configure.prf. Remove some unused functions.
Move platform checks to separate prf file.
Change-Id: Ia45c837c91c341ed1fbc2e32fc098329da989920
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'mkspecs/features/configure.prf')
-rw-r--r-- | mkspecs/features/configure.prf | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index e21767565..ed6fe6c15 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -1,9 +1,28 @@ # Load configure.prf from qtbase first load(configure) load(functions) +load(platform) defineTest(runConfigure) { webengine_successfully_configured: return(true) + + !exists(src/3rdparty/chromium) { + skipBuild("Submodule qtwebengine-chromium does not exist. Run 'git submodule update --init'.") + return(false) + } + + WSPC = $$find(OUT_PWD, \\s) + !isEmpty(WSPC) { + skipBuild("QtWebEngine cannot be built in a path that contains whitespace characters.") + return(false) + } + + !isPlatformSupported() { + # make sure we have skipBuildReason + isEmpty(skipBuildReason): skipBuild("Unknow error. Platform unspported") + return(false) + } + linux:contains(QT_CONFIG,no-pkg-config) { skipBuild("pkg-config is required") return(false) @@ -46,12 +65,8 @@ defineTest(runConfigure) { !contains(WEBENGINE_CONFIG, use_system_ffmpeg): WEBENGINE_CONFIG += use_bundled_ffmpeg !contains(WEBENGINE_CONFIG, use_system_icu): WEBENGINE_CONFIG += use_bundled_icu - isQtMinimum(5, 9) { - qtConfig(appstore-compliant): WEBENGINE_CONFIG += use_appstore_compliant_code - optimize_size: WEBENGINE_CONFIG += reduce_binary_size - } else { - qtConfig(embedded): WEBENGINE_CONFIG += reduce_binary_size - } + qtConfig(appstore-compliant): WEBENGINE_CONFIG += use_appstore_compliant_code + optimize_size: WEBENGINE_CONFIG += reduce_binary_size sanitizer: !qtConfig(webengine-sanitizer) { skipBuild("Chosen sanitizer configuration is not supported. Use --feature-webengine-sanitizer=yes to force build with the chosen sanitizer configuration.") @@ -119,10 +134,6 @@ defineTest(runConfigure) { } } - win32:!qtConfig(winversion) { - skipBuild("Needs VS 2015 Update 3 with Cumulative Servicing Release or higher") - } - isEmpty(skipBuildReason) { cache(CONFIG, add, $$list(webengine_successfully_configured)) !isEmpty(WEBENGINE_CONFIG) { |