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/config/linux.pri | |
| 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/config/linux.pri')
| -rw-r--r-- | src/core/config/linux.pri | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 0eea066e4..752d2281f 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -69,6 +69,7 @@ contains(QT_ARCH, "arm") { gn_args += arm_version=$$MARMV } + # TODO: use neon detection from qtbase !lessThan(MARMV, 8) { gn_args += arm_use_neon=true } else { @@ -83,10 +84,16 @@ contains(QT_ARCH, "arm") { } } - MTHUMB = $$extractCFlag("-mthumb") - MARM = $$extractCFlag("-marm") - if (isEmpty(MARMV) | lessThan(MARMV, 7) | !isEmpty(MARM)): gn_args += arm_use_thumb=false - else: !isEmpty(MTHUMB): gn_args += arm_use_thumb=true + qtConfig(webengine-arm-thumb) { + gn_args += arm_use_thumb=true # this adds -mthumb + } else { + gn_args += arm_use_thumb=false + !qtConfig(webengine-system-ffmpeg) { + # Fixme QTBUG-71772 + gn_args += media_use_ffmpeg=false + gn_args += use_webaudio_ffmpeg=false + } + } } contains(QT_ARCH, "mips") { |