diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-29 13:04:09 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-29 13:04:31 +0200 |
| commit | e6c64fa060906997af46d42f8ce768be9449534d (patch) | |
| tree | 0170d8ab4f26b686263ea8a5a0ee1f6b540628cd /tools/qmake/mkspecs/features | |
| parent | 42a422ff035d51f5a20e7b0024ea30e764b92097 (diff) | |
| parent | 8575d9aa489f4c9e839e3cb28b9f8c27acbdb425 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I922e637ffbf03aa15711fa5d0e10ecd4f25448ab
Diffstat (limited to 'tools/qmake/mkspecs/features')
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 84ec4d7f0..0dfb67a84 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -90,7 +90,7 @@ defineTest(finalizeConfigure) { skipBuild("Unmet dependencies: icu-uc, icu-i18n") } } else { - log("ICU............................... Using internal copy (Default, force system ICU with WEBENGINE_CONFIG += use_system_icu)$${EOL}") + log("ICU............................... Using internal copy (Default, force system ICU with WEBENGINE_CONFIG+=use_system_icu)$${EOL}") } use?(system_ffmpeg) { packagesExist("libavcodec libavformat libavutil") { @@ -105,13 +105,13 @@ defineTest(finalizeConfigure) { skipBuild("Unmet dependencies: libavcodec, libavformat, libavutil") } } else { - log("FFMPEG............................ Using internal copy (Default, force system FFMPEG with WEBENGINE_CONFIG += use_system_ffmpeg)$${EOL}") + log("FFMPEG............................ Using internal copy (Default, force system FFMPEG with WEBENGINE_CONFIG+=use_system_ffmpeg)$${EOL}") } } 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 WEBENGINE_CONFIG+=use_proprietary_codecs)$${EOL}") } osx { use?(appstore_compliant_code) { |