Conflicts: .qmake.conf src/gui/painting/qdrawhelper.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/network/ssl/qsslsocket_openssl.cpp src/plugins/platforms/android/qandroidinputcontext.cpp src/widgets/styles/qstylesheetstyle.cpp Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io> Change-Id: Ia7daad21f077ea889898f17734ec46303e71fe6b |
||
|---|---|---|
| .. | ||
| qasn1element | ||
| qdtls | ||
| qdtlscookie | ||
| qocsp | ||
| qpassworddigestor | ||
| qsslcertificate | ||
| qsslcipher | ||
| qssldiffiehellmanparameters | ||
| qsslellipticcurve | ||
| qsslerror | ||
| qsslkey | ||
| qsslsocket | ||
| qsslsocket_onDemandCertificates_member | ||
| qsslsocket_onDemandCertificates_static | ||
| ssl.pro | ||