summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2020-07-20 15:55:27 +0200
committerMichal Klocek <michal.klocek@qt.io>2020-07-23 15:13:02 +0200
commit6178015dff6f2f83c16a1dddb199c7f6c3e9c694 (patch)
tree93b402c8ec4e3059ef542f88082b18e92d0609ff
parent91b6803038298cdd30f3b8817b1b06d4ad2afd93 (diff)
Move webengine-noexecstack to buildtools
Change-Id: I854034fd63c8847867fd7ec01d5c25781e7de5ef Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/buildtools/configure.json10
-rw-r--r--src/core/configure.json10
2 files changed, 10 insertions, 10 deletions
diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
index a4c9b1776..1ca6214a0 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -352,6 +352,11 @@
"webengine-sanitizer": {
"label" : "sanitizer support",
"type": "isSanitizerSupported"
+ },
+ "webengine-noexecstack" : {
+ "label": "linker supports -z noexecstack",
+ "type": "linkerSupportsFlag",
+ "flag": "-z,noexecstack"
}
},
"features": {
@@ -671,6 +676,11 @@
"autoDetect": "config.sanitizer && tests.webengine-sanitizer",
"condition": "config.sanitizer",
"output": [ "privateFeature" ]
+ },
+ "webengine-noexecstack": {
+ "label": "linker supports -z noexecstack",
+ "condition": "config.unix && tests.webengine-noexecstack",
+ "output": [ "privateFeature" ]
}
},
"report": [
diff --git a/src/core/configure.json b/src/core/configure.json
index 7ba4a94c7..4cd6174fc 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -92,11 +92,6 @@
"label": "embedded build",
"type": "detectEmbedded"
},
- "webengine-noexecstack" : {
- "label": "linker supports -z noexecstack",
- "type": "linkerSupportsFlag",
- "flag": "-z,noexecstack"
- },
"webengine-nodejs": {
"label": "node.js",
"type": "detectNodeJS"
@@ -218,11 +213,6 @@
{ "type": "privateConfig", "name": "webcore_debug" }
]
},
- "webengine-noexecstack": {
- "label": "linker supports -z noexecstack",
- "condition": "config.unix && tests.webengine-noexecstack",
- "output": [ "privateFeature" ]
- },
"webengine-nodejs": {
"label": "Node.js",
"condition": "tests.webengine-nodejs",