Simon Hausmann e281537f20 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/qglobal.h src/platformsupport/platformcompositor/qopenglcompositor.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I5422868500be695584a496dbbbc719d146bc572d		2014-12-18 12:12:58 +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	Mark QSocks5SocketEngine tests blacklisted	2014-11-21 16:48:20 +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