Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c		2015-07-01 11:05:26 +02:00
..
qauthenticator	Update copyright headers	2015-02-11 06:49:51 +00:00
qdnslookup	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
qdnslookup_appless	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-02 09:23:07 +01:00
qhostaddress	fix usage of wince scope	2015-06-05 10:29:10 +00:00
qhostinfo	fix usage of wince scope	2015-06-05 10:29:10 +00:00
qnetworkaddressentry	Update copyright headers	2015-02-11 06:49:51 +00:00
qnetworkinterface	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qnetworkproxy	Update copyright headers	2015-02-11 06:49:51 +00:00
qnetworkproxyfactory	Tests: Blacklist tests for ubuntu 14.04	2015-04-01 13:59:04 +00:00
kernel.pro	Disable tst_qhostinfo on OS X.	2014-10-10 13:15:43 +02:00