29f01b32f5
Conflicts: src/corelib/configure.json Change-Id: I93ac67f3bf4844bc7c691183e94bceb922b7b919 |
||
---|---|---|
.. | ||
qsslsocket_onDemandCertificates_member.pro | ||
tst_qsslsocket_onDemandCertificates_member.cpp |
29f01b32f5
Conflicts: src/corelib/configure.json Change-Id: I93ac67f3bf4844bc7c691183e94bceb922b7b919 |
||
---|---|---|
.. | ||
qsslsocket_onDemandCertificates_member.pro | ||
tst_qsslsocket_onDemandCertificates_member.cpp |