diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-07 17:00:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-07 17:00:15 +0200 |
| commit | e5ee4480d362efcae7089ee2163e8c88007f94db (patch) | |
| tree | a76d5434ef0d318370cedb9ea95772c4d03e7460 /src/core/configure.json | |
| parent | 2c86c348d7a94f27d1e9e7a71c2435565cbe6fb5 (diff) | |
| parent | 80674ddb452c6926a01fcb0f35699252cf452043 (diff) | |
Merge remote-tracking branch 'origin/5.12.4' into 5.12
Change-Id: I243662eee18709478038e918ff6b16aabd1f0662
Diffstat (limited to 'src/core/configure.json')
| -rw-r--r-- | src/core/configure.json | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/core/configure.json b/src/core/configure.json index fc23785df..6dccd1644 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -327,6 +327,11 @@ "webengine-arm-thumb" : { "label": "thumb instruction set", "type": "hasThumbFlag" + }, + "webengine-noexecstack" : { + "label": "linker supports -z noexecstack", + "type": "linkerSupportsFlag", + "flag": "-z,noexecstack" } }, @@ -658,6 +663,11 @@ "label": "Thumb instruction set", "condition": "config.linux && features.webengine-embedded-build && arch.arm && tests.webengine-arm-thumb", "output": [ "privateFeature" ] + }, + "webengine-noexecstack": { + "label": "linker supports -z noexecstack", + "condition": "config.unix && tests.webengine-noexecstack", + "output": [ "privateFeature" ] } }, |