summaryrefslogtreecommitdiffstats
path: root/configure.pri
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-11-06 09:16:15 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-01-13 16:12:06 +0100
commitc9d902ca6ca3b1aa2e2762329d18c226d26520af (patch)
tree199fdd7b3f0d0ad21597fafa086729dc2e75d4e1 /configure.pri
parent7869ec5823da36a3ce33b379d3d664204756cad5 (diff)
Adaptations for Chromium 87
Change-Id: Ic4ffd98e02f986dbaf986405360e727c813e696e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'configure.pri')
-rw-r--r--configure.pri13
1 files changed, 13 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri
index e4d04a898..519b1aa65 100644
--- a/configure.pri
+++ b/configure.pri
@@ -201,6 +201,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)
}