Frederik Gladhorn a09a8d509a Merge remote-tracking branch 'origin/5.3' into dev ... Conflicts: mkspecs/qnx-x86-qcc/qplatformdefs.h src/corelib/global/qglobal.h src/network/socket/qnativesocketengine_winrt.cpp src/plugins/platforms/android/androidjniaccessibility.cpp src/plugins/platforms/windows/qwindowswindow.cpp Manually adjusted: mkspecs/qnx-armle-v7-qcc/qplatformdefs.h to include 9ce697f2d5 Thanks goes to Sergio for the qnx mkspecs adjustments. Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e		2014-07-01 16:25:19 +02:00
..
access	network internals: do not try to cache a deleted entry	2014-06-24 15:07:03 +02:00
bearer	Fix crash in QNetworkAccessManager.	2014-05-19 15:52:58 +02:00
kernel	Android: Fix compilation of qhostaddress test	2014-06-30 08:59:45 +02:00
socket	Android: Fix compilation of qtcpsocket test	2014-06-30 11:40:24 +02:00
ssl	Move the PKCS#12 support from QSslSocket to QSslCertificate.	2014-05-14 11:08:01 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00