diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-06 11:40:41 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-06 12:57:21 +0200 |
| commit | ecb537e8233c8847d14f36ec3bf698711d6d151a (patch) | |
| tree | f9cb367d6e66067970102ed1864f7280f3750ccc /mkspecs | |
| parent | 9b449045fbd5fd3b58bcaff6cf0c5878cd6e64eb (diff) | |
| parent | ad55613c2648edb67353c3882d1956b54fc323b4 (diff) | |
Merge branch '5.9' into 5.10
Change-Id: I9fe9946ba47f9ef509a861963c83e275a25fffd0
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/configure.prf | 11 | ||||
| -rw-r--r-- | mkspecs/features/functions.prf | 5 |
2 files changed, 4 insertions, 12 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index 37128bf93..2264ba704 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -50,6 +50,7 @@ defineTest(runConfigure) { qtConfig(system-opus): WEBENGINE_CONFIG += use_system_opus qtConfig(system-ffmpeg): WEBENGINE_CONFIG += use_system_ffmpeg qtConfig(system-icu): WEBENGINE_CONFIG += use_system_icu + qtConfig(system-re2): WEBENGINE_CONFIG += use_system_re2 !contains(WEBENGINE_CONFIG, use_system_libwebp): WEBENGINE_CONFIG += use_bundled_libwebp !contains(WEBENGINE_CONFIG, use_system_opus): WEBENGINE_CONFIG += use_bundled_opus @@ -122,11 +123,6 @@ defineTest(runConfigure) { log("Compatible system libvpx not found. Using Chromium's copy.$${EOL}") WEBENGINE_CONFIG += use_bundled_libvpx } - config_srtp: WEBENGINE_CONFIG += use_system_libsrtp - else { - log("System libsrtp not found. Using Chromium's copy.$${EOL}") - WEBENGINE_CONFIG += use_bundled_srtp - } config_snappy: WEBENGINE_CONFIG += use_system_snappy else { log("System snappy not found. Using Chromium's copy.$${EOL}") @@ -162,11 +158,6 @@ defineTest(runConfigure) { !isEmpty(use_bundled): log(" Optional bundled libraries used .... $$use_bundled$${EOL}") } log("Configurable features:$${EOL}") - use?(proprietary_codecs) { - log(" Proprietary codecs (H264, MP3) ..... Enabled$${EOL}") - } else { - log(" Proprietary codecs (H264, MP3) ..... Not enabled (Default, enable with -proprietary-codecs)$${EOL}") - } qtHaveModule(positioning): { log(" Geolocation ........................ Enabled$${EOL}") } else { diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index 56894e58a..b78d2a112 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -81,9 +81,10 @@ defineTest(isPlatformSupported) { defineTest(isArchSupported) { contains(QT_ARCH, "i386")|contains(QT_ARCH, "x86_64"): return(true) contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true) - contains(QT_ARCH, "mips")|contains(QT_ARCH, "mips64"): return(true) + contains(QT_ARCH, "mips"): return(true) +# contains(QT_ARCH, "mips64"): return(true) - skipBuild("QtWebEngine can only be built for x86, x86-64, ARM, Aarch64, MIPSel, and MIPS64 architectures.") + skipBuild("QtWebEngine can only be built for x86, x86-64, ARM, Aarch64, and MIPSel architectures.") return(false) } |