diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2021-03-17 08:00:26 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2021-03-18 10:20:37 +0100 |
| commit | c20ad7f10166b2fbd292836b6809dfcf2e65b46c (patch) | |
| tree | b5574504c2ce47410c0ed6cbf2151a234d6bc55f | |
| parent | f058e494c2200b6a95615c00f30afc9e33306a99 (diff) | |
openssl: fix the build on Linux
qtbase/src/network/ssl/qtls_openssl.cpp:1527:34: error: ‘qScopeGuard’ was not declared in this scope
qtbase/src/network/ssl/qtlsbackend_openssl.cpp:227:9: error: ‘QDirIterator’ was not declared in this scope; did you mean ‘QSetIterator’?
qtbase/src/network/ssl/qtlsbackend_openssl.cpp: In function ‘QList<QSslCertificate> QTlsPrivate::systemCaCertificates()’:
qtbase/src/network/ssl/qtlsbackend_openssl.cpp:387:10: error: aggregate ‘QDir currentDir’ has incomplete type and cannot be defined
tbase/src/network/ssl/qtlsbackend_openssl.cpp:414:13: error: ‘QDirIterator’ was not declared in this scope; did you mean ‘QSetIterator’?
qtbase/src/network/ssl/qtlsbackend_openssl.cpp:415:20: error: ‘it’ was not declared in this scope; did you mean ‘Qt’?
qtbase/src/network/ssl/qtls_openssl.cpp:1527:34: error: ‘qScopeGuard’ was not declared in this scope
qtbase/src/network/ssl/qtlsbackend_openssl.cpp:229:45: error: variable ‘QDirIterator iterator’ has initializer but incomplete type
Change-Id: Ibcf4c7731b04f3f4be59d95130e088114f1536df
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| -rw-r--r-- | src/network/ssl/qtls_openssl.cpp | 1 | ||||
| -rw-r--r-- | src/network/ssl/qtlsbackend_openssl.cpp | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/network/ssl/qtls_openssl.cpp b/src/network/ssl/qtls_openssl.cpp index 010794c499..90561943f5 100644 --- a/src/network/ssl/qtls_openssl.cpp +++ b/src/network/ssl/qtls_openssl.cpp @@ -51,6 +51,7 @@ #endif #include <QtCore/qscopedvaluerollback.h> +#include <QtCore/qscopeguard.h> #include <algorithm> #include <cstring> diff --git a/src/network/ssl/qtlsbackend_openssl.cpp b/src/network/ssl/qtlsbackend_openssl.cpp index ca1a40459a..ef4aab6283 100644 --- a/src/network/ssl/qtlsbackend_openssl.cpp +++ b/src/network/ssl/qtlsbackend_openssl.cpp @@ -54,8 +54,11 @@ #include <qssl.h> -#include <qmutex.h> +#include <qdir.h> +#include <qdiriterator.h> #include <qlist.h> +#include <qmutex.h> +#include <qscopeguard.h> #include <algorithm> |