Liang Qi dc37318684 Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: src/gui/util/qshaderformat.cpp src/gui/util/qshaderformat_p.h src/widgets/graphicsview/qgraphicsitem_p.h Change-Id: Idafd88eb9a0a15b4af29f6143d009c1ec8ceecca		2019-04-24 09:52:30 +02:00
..
mingw_make.cpp	qmake: make sure QMAKE_LIBS{,_PRIVATE} comes after LIBS{,_PRIVATE}	2018-10-12 18:06:33 +00:00
mingw_make.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00
msbuild_objectmodel.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-04-24 09:52:30 +02:00
msbuild_objectmodel.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00
msvc_nmake.cpp	Fix precompiled headers with clang-cl	2019-04-09 21:58:54 +00:00
msvc_nmake.h	Make the Makefile a dependency of default targets for nmake	2019-02-04 08:10:25 +00:00
msvc_objectmodel.cpp	Merge remote-tracking branch 'origin/5.13' into dev	2019-04-24 09:52:30 +02:00
msvc_objectmodel.h	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-04-24 01:00:13 +02:00
msvc_vcproj.cpp	qmake: Remove special-handling of cl.exe's -Gm option	2019-04-09 07:00:18 +00:00
msvc_vcproj.h	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-02-28 01:00:15 +01:00
msvc_vcxproj.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_vcxproj.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00
winmakefile.cpp	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-03-06 12:31:50 +01:00
winmakefile.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00