diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-29 14:17:21 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-05-29 14:17:21 +0000 |
| commit | 0c5fbd397ceda4d9f0046f1204b5e49229d04312 (patch) | |
| tree | 42a6113cad49eaff6b23664a4ac631a217d983c5 /src/network | |
| parent | 386aca1ba4da3383cd6b6253a7240417ff2d91a0 (diff) | |
| parent | 2670bdeee4b610be719caed841882babe7541ec9 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4.2' into 5.4" into refs/staging/5.4
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); } /*! |