Liang Qi 818014b449 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: configure src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp src/network/access/qnetworkaccessmanager.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h src/widgets/widgets/qlineedit_p.cpp src/widgets/widgets/qlineedit_p.h src/winmain/winmain.pro tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp tools/configure/configureapp.cpp Change-Id: Ib9997b0d0f91946e4081d36c0c6b696c5c983b2a		2016-05-19 12:55:27 +02:00
..
qauthenticator	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
qdnslookup	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
qdnslookup_appless	Updated license headers	2016-01-21 18:55:18 +00:00
qhostaddress	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-13 06:55:37 +02:00
qhostinfo	Add Intel copyright to files that Intel has had non-trivial contribution	2016-01-21 22:44:21 +00:00
qnetworkaddressentry	Updated license headers	2016-01-21 18:55:18 +00:00
qnetworkinterface	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
qnetworkproxy	Updated license headers	2016-01-21 18:55:18 +00:00
qnetworkproxyfactory	Updated license headers	2016-01-21 18:55:18 +00:00
kernel.pro	Disable tst_qhostinfo on OS X.	2014-10-10 13:15:43 +02:00