Liang Qi 4dd8a63fc1 Merge remote-tracking branch 'origin/5.5.0' into 5.5 ... Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.h Manually fixed src/testlib/qtestcase.cpp to return the right type. Change-Id: Id1634dbe3d73fefe9431b9f5378846cb187624e4		2015-06-27 13:54:35 +02:00
..
.gitignore
qsslellipticcurve.pro	fix usage of wince scope	2015-06-05 10:29:10 +00:00
tst_qsslellipticcurve.cpp	QSslSocket: move default cipher, EC and default CA APIs to QSslConfiguration	2015-06-11 04:18:37 +00:00