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
..
icons	Make the ICO image handler capable of reading CUR files too.	2014-06-05 19:10:58 +02:00
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
qicoimageformat.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
qicoimageformat.qrc	Android: Fix qicoimageformat test.	2014-12-22 08:34:05 +01:00
tst_qicoimageformat.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00