818014b449
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 |
||
|---|---|---|
| .. | ||
| cesdkhandler.cpp | ||
| cesdkhandler.h | ||
| mingw_make.cpp | ||
| mingw_make.h | ||
| msbuild_objectmodel.cpp | ||
| msbuild_objectmodel.h | ||
| msvc_nmake.cpp | ||
| msvc_nmake.h | ||
| msvc_objectmodel.cpp | ||
| msvc_objectmodel.h | ||
| msvc_vcproj.cpp | ||
| msvc_vcproj.h | ||
| msvc_vcxproj.cpp | ||
| msvc_vcxproj.h | ||
| winmakefile.cpp | ||
| winmakefile.h | ||