Frederik Gladhorn aaff94c2df Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/tools/qbytearray.cpp src/gui/kernel/qplatformsystemtrayicon.cpp src/gui/kernel/qplatformsystemtrayicon.h src/plugins/platforms/xcb/xcb-plugin.pro Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79		2014-12-29 16:37:38 +01:00
..
access	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-18 12:12:58 +01:00
bearer	Change bugreports.qt-project.org -> bugreports.qt.io	2014-12-18 09:46:09 +01:00
kernel	Disable tst_qhostinfo on OS X.	2014-10-10 13:15:43 +02:00
socket	tst_QUdpSocket: Fix inverted logic in getting a non-"any" address	2014-12-28 15:58:54 +01:00
ssl	ssl: store socket in setEmptyDefaultConfiguration	2014-12-13 08:32:19 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00