summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/configure.prf
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs/features/configure.prf')
-rw-r--r--mkspecs/features/configure.prf10
1 files changed, 5 insertions, 5 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
index 3c9d02328..c1e919603 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
@@ -31,13 +31,13 @@ defineTest(runConfigure) {
qtConfig(webrtc): WEBENGINE_CONFIG += use_webrtc
qtConfig(embedded): WEBENGINE_CONFIG += embedded_build
qtConfig(system-webp): WEBENGINE_CONFIG += use_system_libwebp
- else: WEBENGINE_CONFIG += use_bundled_libwebp
qtConfig(system-opus): WEBENGINE_CONFIG += use_system_opus
- else: WEBENGINE_CONFIG += use_bundled_opus
qtConfig(system-ffmpeg): WEBENGINE_CONFIG += use_system_ffmpeg
- else: WEBENGINE_CONFIG += use_bundled_ffmpeg
qtConfig(system-icu): WEBENGINE_CONFIG += use_system_icu
- else: WEBENGINE_CONFIG += use_bundled_icu
+ !contains(WEBENGINE_CONFIG, use_system_libwebp): WEBENGINE_CONFIG += use_bundled_libwebp
+ !contains(WEBENGINE_CONFIG, use_system_opus): WEBENGINE_CONFIG += use_bundled_opus
+ !contains(WEBENGINE_CONFIG, use_system_ffmpeg): WEBENGINE_CONFIG += use_bundled_ffmpeg
+ !contains(WEBENGINE_CONFIG, use_system_icu): WEBENGINE_CONFIG += use_bundled_icu
} else {
# Feature defaults when building with Qt 5.6 LTS:
cross_compile {
@@ -187,7 +187,7 @@ defineTest(runConfigure) {
use?(proprietary_codecs) {
log(" Proprietary codecs (H264, MP3) ..... Enabled$${EOL}")
} else {
- log(" Proprietary codecs (H264, MP3) ..... Not enabled (Default, enable with WEBENGINE_CONFIG+=use_proprietary_codecs)$${EOL}")
+ log(" Proprietary codecs (H264, MP3) ..... Not enabled (Default, enable with -proprietary-codecs)$${EOL}")
}
qtHaveModule(positioning): {
log(" Geolocation ........................ Enabled$${EOL}")