diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-15 16:22:25 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-16 09:56:50 +0000 |
| commit | f14e041b3847b1fb87dc4daf464462f67bc0c778 (patch) | |
| tree | 2d5639bc021b32e5dc32f3f33dcf273bb204b4cb /mkspecs | |
| parent | 17b07b9ae058884b2b8d12ddd8d57ce6b7c14b64 (diff) | |
Update changes and configure feedback
Document changes to configure system and ensure we don't output nonsense
when the two systems are mixed.
Also updates changes to include security fixes and that binary compatibily
was fixed, and lists all relevant bug-fixes I could fine.
Change-Id: I68aa729e0846a0c0c18fd7d91e016b551157ddd6
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/configure.prf | 10 |
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}") |