Liang Qi 8559bf934d Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/corelib/global/qconfig-bootstrapped.h src/plugins/platforms/xcb/qxcbbackingstore.cpp Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I4af138ffb2f5306373244523768209e8873b2798		2018-08-16 18:48:59 +02:00
..
mac	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
unix	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
win32	Merge remote-tracking branch 'origin/5.11' into dev	2018-08-16 18:48:59 +02:00
makefile.cpp	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
makefile.h	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
makefiledeps.cpp	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
makefiledeps.h	qmake: replace a uint:1 with a bool	2016-08-15 22:16:09 +00:00
metamakefile.cpp	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
metamakefile.h	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
projectgenerator.cpp	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
projectgenerator.h	qmake: Apply modernize-use-override	2018-08-08 17:30:23 +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