diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2018-11-13 18:50:01 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2018-11-21 16:30:02 +0000 |
| commit | 55181670c621dfd79d0bb05738cb5b59665e6bd7 (patch) | |
| tree | 5514c1832355cc3612b83c05be343e0a687a42c7 /src/core/configure.json | |
| parent | c0ac4d0673a25d52ad7d315b6e96f75bbe8be14c (diff) | |
Add check for thumb instruction set
We currently require thumb instruction set on arm to build internal
ffmpeg.
Task-number: QTBUG-71772
Change-Id: I43ed152a51f0dea97b800c868eb13a4e5e8e077e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/configure.json')
| -rw-r--r-- | src/core/configure.json | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/core/configure.json b/src/core/configure.json index f49bf08d1..e17605302 100644 --- a/src/core/configure.json +++ b/src/core/configure.json @@ -328,6 +328,10 @@ "webengine-win-compiler64": { "label": "64bit compiler", "type": "isWindowsHostCompiler64" + }, + "webengine-arm-thumb" : { + "label": "thumb instruction set", + "type": "hasThumbFlag" } }, @@ -659,6 +663,11 @@ "label": "64bit compiler", "condition": "config.win32 && tests.webengine-win-compiler64", "output": [ "privateFeature" ] + }, + "webengine-arm-thumb": { + "label": "Thumb instruction set", + "condition": "config.linux && features.webengine-embedded-build && arch.arm && tests.webengine-arm-thumb", + "output": [ "privateFeature" ] } }, @@ -697,6 +706,11 @@ "type": "warning", "condition": "config.win32 && !features.webengine-win-compiler64", "message": "64-bit cross-building or native toolchain is required to build QtWebEngine." + }, + { + "type": "warning", + "condition": "config.linux && features.webengine-embedded-build && !features.webengine-system-ffmpeg && arch.arm && !features.webengine-arm-thumb", + "message": "Thumb instruction set is required to build ffmpeg for QtWebEngine." } ], |