diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-29 09:59:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-29 10:00:01 +0200 |
| commit | 2670bdeee4b610be719caed841882babe7541ec9 (patch) | |
| tree | f490d43df0be0d4802edf8873a60ab2a7579e33d /src/network | |
| parent | 18be63de2a5588ea6ac4b9ffe8de176aabe8bd83 (diff) | |
| parent | e3983c87280ade48b243d9c60bed639713851be9 (diff) | |
Merge remote-tracking branch 'origin/5.4.2' into 5.4
Change-Id: Ied2a227a25859163a924c7b5717492a1f974c5ca
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index b132aec038..ac4336afcc 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -588,7 +588,10 @@ long QSslSocketPrivate::sslLibraryBuildVersionNumber() QString QSslSocketPrivate::sslLibraryBuildVersionString() { - return QLatin1String(OPENSSL_VERSION_TEXT); + // Using QStringLiteral to store the version string as unicode and + // avoid false positives from Google searching the playstore for old + // SSL versions. See QTBUG-46265 + return QStringLiteral(OPENSSL_VERSION_TEXT); } /*! |