diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-05-20 18:23:46 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-05-28 18:53:50 +0200 |
| commit | 1b80f4d302011ee05691ef873b9d2ba430c2acf3 (patch) | |
| tree | dc8d15f6b2b07b12e4292bf86fb203e34136360d /src/core | |
| parent | 59d12e0bbd0e620fc60d719acfbb45dfb8495e23 (diff) | |
Move arm-thumb feature to buildtools
Share arm-thumb setting between pdf and webengine.
Move webengine-embedded to webengine since it is not used
by pdf.
Change-Id: Id23888423af7a37a3b3aa06e40dc0359fb90724b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/config/linux.pri | 4 | ||||
| -rw-r--r-- | src/core/configure.json | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index f890f0a6c..e98524002 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -1,5 +1,9 @@ include(common.pri) +qtConfig(webengine-embedded-build) { + gn_args += is_desktop_linux=false +} + !host_build{ diff --git a/src/core/configure.json b/src/core/configure.json index 167555d79..e0de69b10 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -89,10 +89,6 @@ "label" : "sanitizer support", "type": "isSanitizerSupported" }, - "webengine-arm-thumb" : { - "label": "thumb instruction set", - "type": "hasThumbFlag" - }, "webengine-noexecstack" : { "label": "linker supports -z noexecstack", "type": "linkerSupportsFlag", @@ -204,11 +200,6 @@ "condition": "libs.webengine-poppler-cpp", "output": [ "privateFeature" ] }, - "webengine-arm-thumb": { - "label": "Thumb instruction set", - "condition": "config.linux && features.webengine-embedded-build && arch.arm && tests.webengine-arm-thumb", - "output": [ "privateFeature" ] - }, "webengine-full-debug-info": { "label": "Full debug information", "purpose": "Enables debug information for Blink and V8.", |