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
..
mac	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-25 14:03:45 +02:00
unix	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-03-11 20:08:50 +01:00
win32	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
makefile.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-06 15:36:44 +02:00
makefile.h	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
makefiledeps.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-29 17:55:20 +02:00
makefiledeps.h	Updated license headers	2016-01-21 18:55:18 +00:00
metamakefile.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-29 17:55:20 +02:00
metamakefile.h	Updated license headers	2016-01-21 18:55:18 +00:00
projectgenerator.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
projectgenerator.h	Updated license headers	2016-01-21 18:55:18 +00:00
xmloutput.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
xmloutput.h	Updated license headers	2016-01-21 18:55:18 +00:00