diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-06-22 11:36:46 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-06-23 17:03:21 +0200 |
| commit | 4ff62aec5727ea8f0ae8e9771dc72d977df98d70 (patch) | |
| tree | ddfef23d46e01bef8c65c90e03341418f27fa716 | |
| parent | a6c67738b0b7d00687187e7c36b7c1aef218bbc5 (diff) | |
Detect the presence of host node.js
Allows building with or without it.
Fixes: QTBUG-83729
Change-Id: I88d784e3230208e1268491c6ae0a4ebf1543aac8
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | configure.pri | 13 | ||||
| -rw-r--r-- | src/core/config/common.pri | 6 | ||||
| -rw-r--r-- | src/core/configure.json | 15 |
3 files changed, 34 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index 9c7687eea..d3ba9b147 100644 --- a/configure.pri +++ b/configure.pri @@ -191,6 +191,19 @@ defineTest(qtConfTest_detectGn) { return(false) } +defineTest(qtConfTest_detectNodeJS) { + nodejs = $$qtConfFindInPath("nodejs$$EXE_SUFFIX") + isEmpty(nodejs) { + qtLog("'nodejs$$EXE_SUFFIX' not found in PATH. Checking for 'node$$EXE_SUFFIX'.") + nodejs = $$qtConfFindInPath("node$$EXE_SUFFIX") + isEmpty(nodejs) { + qtLog("'node$$EXE_SUFFIX' not found in PATH. Giving up.") + return(false) + } + } + return(true) +} + defineTest(qtConfTest_detectEmbedded) { lessThan(QT_MINOR_VERSION, 9) { cross_compile: return(true) diff --git a/src/core/config/common.pri b/src/core/config/common.pri index 12a46c5f8..c1658ce82 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -42,3 +42,9 @@ qtConfig(webengine-kerberos) { } else { gn_args += use_kerberos=false } + +qtConfig(webengine-nodejs) { + gn_args += have_nodejs=true +} else { + gn_args += have_nodejs=false +} diff --git a/src/core/configure.json b/src/core/configure.json index 8146b5b96..1a2162723 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -89,6 +89,10 @@ "label": "linker supports -z noexecstack", "type": "linkerSupportsFlag", "flag": "-z,noexecstack" + }, + "webengine-nodejs": { + "label": "node.js", + "type": "detectNodeJS" } }, "features": { @@ -204,6 +208,11 @@ "label": "linker supports -z noexecstack", "condition": "config.unix && tests.webengine-noexecstack", "output": [ "privateFeature" ] + }, + "webengine-nodejs": { + "label": "Node.js", + "condition": "tests.webengine-nodejs", + "output": [ "privateFeature" ] } }, @@ -222,6 +231,11 @@ "type": "warning", "condition": "config.unix && config.cross_compile && !features.webengine-v8-snapshot-support", "message": "V8 snapshot cannot be built. Most likely, the 32-bit host compiler does not work. Please make sure you have 32-bit devel environment installed." + }, + { + "type": "warning", + "condition": "!features.webengine-nodejs", + "message": "Building without node.js will disable some features of QtWebEngine DevTools." } ], @@ -242,6 +256,7 @@ "webengine-webchannel", "webengine-kerberos", "webengine-extensions", + "webengine-nodejs", { "type": "feature", "args": "webengine-ozone", |