diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-22 10:55:57 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-25 15:41:53 +0100 |
commit | cde72003881c6b5680ac8ac0fe6d6971bb43e0d5 (patch) | |
tree | fcb50002765c1cb179dd6f62054380c3fed85e80 /configure.pri | |
parent | 3fb215dab139fd7b61473ce3fe1058b87a6b4fe3 (diff) | |
parent | 75d061bbc68875c08b3dc243e464e32a80da71df (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Including update to 87-based
Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6
Diffstat (limited to 'configure.pri')
-rw-r--r-- | configure.pri | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/configure.pri b/configure.pri index 2d42613c0..87dc4d8d0 100644 --- a/configure.pri +++ b/configure.pri @@ -175,16 +175,6 @@ defineTest(qtConfTest_detectNinja) { return(false) } -defineTest(qtConfTest_detectProtoc) { - protoc = $$qtConfFindInPath("protoc") - isEmpty(protoc) { - qtLog("Optional protoc could not be found.") - return(false) - } - qtLog("Found protoc from path: $$protoc") - return(true) -} - defineTest(qtConfTest_detectGn) { gn = $$qtConfFindInPath("gn$$EXE_SUFFIX") !isEmpty(gn) { @@ -207,6 +197,19 @@ defineTest(qtConfTest_detectNodeJS) { return(false) } } + nodejs = $$system_quote($$system_path($$nodejs)) + !qtRunLoggedCommand("$$nodejs --version", version) { + qtLog("'$$nodejs' didn't run.") + return(false) + } + # at least version 10 + version10 = false + contains(version, "v([1-9][0-9])\..*"): version10 = true + + $${1}.version10 = $$version10 + export($${1}.version10) + $${1}.cache += version10 + export($${1}.cache) return(true) } @@ -436,8 +439,8 @@ defineTest(qtwebengine_isWindowsPlatformSupported) { qtwebengine_platformError("requires MSVC or Clang (MSVC mode).") return(false) } - !qtwebengine_isMinWinSDKVersion(10, 18362): { - qtwebengine_platformError("requires a Windows SDK version 10.0.18362 or newer.") + !qtwebengine_isMinWinSDKVersion(10, 19041): { + qtwebengine_platformError("requires a Windows SDK version 10.0.19041 or newer.") return(false) } return(true) |