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
..
animation	Updated license headers	2016-01-21 18:55:18 +00:00
codecs	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
global	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-04 08:59:18 +02:00
io	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
itemmodels	Updated license headers	2016-01-21 18:55:18 +00:00
json	QJsonObject: add some overloads taking QLatin1String	2016-05-10 21:18:46 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
mimetypes	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-27 09:18:05 +02:00
plugin	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-21 09:02:57 +01:00
statemachine	Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev	2016-01-26 11:27:37 +00:00
thread	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-24 20:37:33 +01:00
tools	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
xml	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-21 09:02:57 +01:00
corelib.pro	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00