Frederik Gladhorn 39a290af6c Merge remote-tracking branch 'origin/5.3' into dev ... Conflicts: src/gui/accessible/qaccessiblecache_mac.mm src/gui/accessible/qaccessiblecache_p.h src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/widgets/kernel/qwidget_qpa.cpp Manually moved change in qwidget_qpa.cpp to qwidget.cpp (cd07830e3b) Change-Id: Ia51f471f9b53de2f3b07d77ea89db9303ac8961d		2014-07-03 23:56:45 +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	Skip unstable autotests in QtBase.	2014-07-02 09:28:34 +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