Liang Qi 9967a011ea Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: qmake/generators/makefile.cpp src/plugins/platforms/cocoa/qcocoaintegration.h src/plugins/platforms/cocoa/qcocoaintegration.mm Done-With: Jörg Bornemann <joerg.bornemann@qt.io> Change-Id: I5a61e161784cc6f947abe370aab8f2971a9cbe78		2019-06-07 13:19:27 +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.12' into 5.13	2019-04-24 01:00:13 +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.12' into 5.13	2019-06-07 13:19:27 +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	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-06-07 13:19:27 +02:00
msvc_vcproj.h	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-06-07 13:19:27 +02: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-06-07 13:19:27 +02:00
winmakefile.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +00:00