From 4ff62aec5727ea8f0ae8e9771dc72d977df98d70 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 22 Jun 2020 11:36:46 +0200
Subject: 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>
---
 src/core/config/common.pri |  6 ++++++
 src/core/configure.json    | 15 +++++++++++++++
 2 files changed, 21 insertions(+)

(limited to 'src/core')

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",
-- 
cgit v1.2.3