diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-05 15:24:53 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-05 15:24:53 +0000 |
| commit | df5159a8a6b6bf585feb1473054dec2ed5ddb11a (patch) | |
| tree | a56ad5c69e735eeeb1e93e01330ec2498f5ba497 /src/network/ssl/qsslsocket_p.h | |
| parent | 0683c9291f9c1ffe0625fdadee198840047f0e92 (diff) | |
| parent | f2856875843efce9a00e90dad05bde358ab82197 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/network/ssl/qsslsocket_p.h')
| -rw-r--r-- | src/network/ssl/qsslsocket_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index 09bbb703c5..e791b9d166 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -206,7 +206,7 @@ public: private: static bool ensureLibraryLoaded(); static void ensureCiphersAndCertsLoaded(); -#if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK) +#if defined(Q_OS_ANDROID) static QList<QByteArray> fetchSslCertificateData(); #endif |