diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-12 07:39:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-12 07:40:02 +0200 |
| commit | 97c7c1462750690f3f8c1421a0e4b06a37e87394 (patch) | |
| tree | 6a22ecdeeab3f87b589c1031ac86e2a2ed5014ed /tools | |
| parent | 85aeaf70c63c4a50060c2c700be0f4349199ea4e (diff) | |
| parent | 22a550303618202135e58f5673e7b8935d578687 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I939fc07c7e09c5598adb9f49bf6038daa2d871dc
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 4 | ||||
| -rw-r--r-- | tools/scripts/version_resolver.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 7703e3414..84ec4d7f0 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -78,9 +78,9 @@ defineTest(runConfigure) { defineTest(finalizeConfigure) { linux { use?(nss) { - log("SSL............................... Using system NSS$${EOL}") + log("Certificate handling.............. Using system NSS$${EOL}") } else { - log("SSL............................... Using bundled BoringSSL$${EOL}") + log("Certificate handling.............. Using bundled BoringSSL$${EOL}") } use?(system_icu) { packagesExist("icu-uc icu-i18n") { diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index d07ca67da..634fec23e 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -38,7 +38,7 @@ import json import urllib2 import git_submodule as GitSubmodule -chromium_version = '49.0.2623.91' +chromium_version = '49.0.2623.111' chromium_branch = '2623' ninja_version = 'v1.6.0' |