Conflicts: src/corelib/global/qconfig-bootstrapped.h src/corelib/global/qglobal.h src/corelib/tools/qcryptographichash.cpp src/corelib/tools/qcryptographichash.h src/corelib/tools/qmessageauthenticationcode.cpp src/plugins/platforms/windows/qwindowswindow.h tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST Change-Id: Ib68112de985a3d714c2071f47c10e907e4f0229a |
||
|---|---|---|
| .. | ||
| qasn1element | ||
| qsslcertificate | ||
| qsslcipher | ||
| qssldiffiehellmanparameters | ||
| qsslellipticcurve | ||
| qsslerror | ||
| qsslkey | ||
| qsslsocket | ||
| qsslsocket_onDemandCertificates_member | ||
| qsslsocket_onDemandCertificates_static | ||
| ssl.pro | ||