diff options
| author | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-06-02 04:20:54 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-06-02 04:20:54 +0000 |
| commit | 7bc9310a2265e14b6880aa29d96adba6d3d7aed0 (patch) | |
| tree | 0bf906e3585c93cbe5ef67a05b4a129e18e3edbd /src/network/ssl/qsslsocket_openssl.cpp | |
| parent | 6e008cd57955c8029671c4c92250b86767f8ec1f (diff) | |
| parent | fcfd31c9fdd84b234cb9e42b97be62ec18389b61 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5.0
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); } /*! |