Conflicts: configure.pri Also required s/solid\.color/solidColor/ in a couple of places in: src/gui/painting/qpaintengine_raster.cpp Change-Id: I29937f63e9779deb6dac7ae77e2948d06ebc0319 |
||
|---|---|---|
| .. | ||
| qasn1element | ||
| qdtls | ||
| qdtlscookie | ||
| qocsp | ||
| qpassworddigestor | ||
| qsslcertificate | ||
| qsslcipher | ||
| qssldiffiehellmanparameters | ||
| qsslellipticcurve | ||
| qsslerror | ||
| qsslkey | ||
| qsslsocket | ||
| qsslsocket_onDemandCertificates_member | ||
| qsslsocket_onDemandCertificates_static | ||
| ssl.pro | ||