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/buildtools | |
| 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/buildtools')
| -rw-r--r-- | src/buildtools/config/linux.pri | 6 | ||||
| -rw-r--r-- | src/buildtools/configure.json | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri index 297555ac6..56c18bdb5 100644 --- a/src/buildtools/config/linux.pri +++ b/src/buildtools/config/linux.pri @@ -24,10 +24,6 @@ gn_args += \ ozone_platform=\"qt\" \ ozone_extra_path=\"$$QTWEBENGINE_ROOT/src/core/ozone/ozone_extra.gni\" -qtConfig(build-qtwebengine-core):qtConfig(webengine-embedded-build) { - gn_args += is_desktop_linux=false -} - use_gold_linker: gn_args += use_gold=true else: gn_args += use_gold=false @@ -90,7 +86,7 @@ contains(QT_ARCH, "arm") { } } - qtConfig(build-qtwebengine-core):qtConfig(webengine-arm-thumb) { + qtConfig(webengine-arm-thumb) { gn_args += arm_use_thumb=true # this adds -mthumb } else { gn_args += arm_use_thumb=false diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index f9d4900ba..135e0efce 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -344,6 +344,10 @@ "webengine-nowhitespace" : { "label": "build path without whitespace", "type": "detectNoWhitespace" + }, + "webengine-arm-thumb" : { + "label": "thumb instruction set", + "type": "hasThumbFlag" } }, "features": { @@ -649,6 +653,11 @@ "privateFeature", { "type": "varAssign", "name": "PLATFORM_ERROR", "value": "tests.webengine-platform-support.platformSupport" } ] + }, + "webengine-arm-thumb": { + "label": "Thumb instruction set", + "condition": "config.linux && arch.arm && tests.webengine-arm-thumb", + "output": [ "privateFeature" ] } }, "report": [ |