Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b		2014-11-24 13:39:13 +01:00
..
access	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +01:00
bearer	update QtBearer NetworkManager backend API	2014-10-21 01:01:06 +02:00
kernel	Disable tst_qhostinfo on OS X.	2014-10-10 13:15:43 +02:00
socket	Fix how qsocks5socketengine autotests are blacklisted	2014-11-20 14:58:52 +01:00
ssl	Fix invalid qmake syntax	2014-11-19 10:34:24 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00