diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-29 14:46:13 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-01 09:34:06 +0000 |
| commit | ed5b65c70397f3ea9fa524e7f0b98a48a70ddc88 (patch) | |
| tree | 2378153fdf39a8d668ade5b5836c8082873c0f72 | |
| parent | ef1f608f76f02f11b4bdcc8d52fa41cdf4cdf5c3 (diff) | |
Disable WebSpeech
Also allows us to remove code handling libFLAC and libspeex since we no
longer depend on those.
Change-Id: Ifedc19b3c958215d298edd11f9126ea5b9cc09fa
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/config/common.pri | 2 | ||||
| -rw-r--r-- | src/core/config/linux.pri | 2 | ||||
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject b93352c98510fef629d11e8dda91e14aac855f6 +Subproject 3f655a31b4979b0862e5aec1c8f47b597464749 diff --git a/src/core/config/common.pri b/src/core/config/common.pri index 793e26a61..c5921a573 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -6,3 +6,5 @@ GYP_CONFIG += use_qt=1 GYP_CONFIG += v8_use_external_startup_data=0 # Disable printing since we don't support it yet GYP_CONFIG += enable_basic_printing=0 enable_print_preview=0 +# WebSpeech requires Google API keys and adds dependencies on speex and flac. +GYP_CONFIG += enable_web_speech=0 diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 1035e950e..00e25ec58 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -36,11 +36,9 @@ use?(system_libevent): GYP_CONFIG += use_system_libevent=1 use?(system_libwebp): GYP_CONFIG += use_system_libwebp=1 use?(system_libsrtp): GYP_CONFIG += use_system_libsrtp=1 use?(system_libxslt): GYP_CONFIG += use_system_libxml=1 -use?(system_flac): GYP_CONFIG += use_system_flac=1 use?(system_jsoncpp): GYP_CONFIG += use_system_jsoncpp=1 use?(system_opus): GYP_CONFIG += use_system_opus=1 use?(system_snappy): GYP_CONFIG += use_system_snappy=1 -use?(system_speex): GYP_CONFIG += use_system_speex=1 use?(system_vpx): GYP_CONFIG += use_system_libvpx=1 use?(system_icu): GYP_CONFIG += use_system_icu=1 use?(system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1 diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 4be9fac20..4cb4600b6 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -41,7 +41,7 @@ defineTest(runConfigure) { else: log("System libwebp or libwebpdemux not found. Using Chromium's copies.$${EOL}") packagesExist(libxml-2.0,libxslt): WEBENGINE_CONFIG += use_system_libxslt else: log("System libxml2 or libxslt not found. Using Chromium's copies.$${EOL}") - for(package, $$list("libevent flac jsoncpp opus speex")) { + for(package, $$list("libevent jsoncpp opus")) { packagesExist($$package): WEBENGINE_CONFIG += use_system_$$package else: log("System $$package not found. Using Chromium's copy.$${EOL}") } |