diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-02 09:43:46 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-02 09:44:03 +0200 |
| commit | 166c2499d989919a037a599942fb95beb362971e (patch) | |
| tree | 748e58d2ed42422aae1e32a28f57180f5bb1cbea /src/network/ssl/qsslsocket_openssl.cpp | |
| parent | f7047d52da47a8426189d0aff8c5104b23cbfd89 (diff) | |
| parent | 7bc9310a2265e14b6880aa29d96adba6d3d7aed0 (diff) | |
Merge remote-tracking branch 'origin/5.5.0' into 5.5
Change-Id: I060b0e10e55487a4a4a101f77ad7c8dc8cf0f553
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl.cpp')
| -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 954c11d1f0..19848a73f0 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -637,7 +637,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); } /*! |