Frederik Gladhorn b6191b16d4 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af		2015-01-21 11:10:14 +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	Android: XFAIL a few tests in QDnsLookup	2015-01-12 13:09:57 +01:00
socket	Don't bind to QHostAddress::Any if we want to do IPv4 multicast ops	2015-01-05 08:07:10 +01:00
ssl	Add elliptic curve support to QSsl	2015-01-18 10:18:43 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00