diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2020-06-05 09:24:37 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2020-06-06 20:25:49 +0200 |
commit | 45b0f1be686cfba8dcecb9be5c875cae59c69276 (patch) | |
tree | 363dfd46575d147206267d854ce14747157f432e /src/network/ssl/qsslcertificate_p.h | |
parent | aa81b90738ce9faee5e433617c8bd243cb238729 (diff) |
Remove winrt
Macros and the await helper function from qfunctions_winrt(_p).h are
needed in other Qt modules which use UWP APIs on desktop windows.
Task-number: QTBUG-84434
Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/network/ssl/qsslcertificate_p.h')
-rw-r--r-- | src/network/ssl/qsslcertificate_p.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h index 234cd45ceb..4588aa7d6f 100644 --- a/src/network/ssl/qsslcertificate_p.h +++ b/src/network/ssl/qsslcertificate_p.h @@ -70,11 +70,6 @@ struct X509_EXTENSION; struct ASN1_OBJECT; #endif -#ifdef Q_OS_WINRT -#include <wrl.h> -#include <windows.security.cryptography.certificates.h> -#endif - #if QT_CONFIG(schannel) #include <wincrypt.h> #endif @@ -146,12 +141,6 @@ public: QAtomicInt ref; -#ifdef Q_OS_WINRT - Microsoft::WRL::ComPtr<ABI::Windows::Security::Cryptography::Certificates::ICertificate> certificate; - - static QSslCertificate QSslCertificate_from_Certificate(ABI::Windows::Security::Cryptography::Certificates::ICertificate *iCertificate); -#endif - #if QT_CONFIG(schannel) const CERT_CONTEXT *certificateContext = nullptr; |