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
..
mac	qmake: Remove dead code	2019-04-05 07:48:34 +00:00
unix	QRegExp include cleanup	2019-04-19 21:21:17 +00:00
win32	Merge remote-tracking branch 'origin/5.13' into dev	2019-04-24 09:52:30 +02:00
makefile.cpp	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-04-06 01:00:08 +02:00
makefile.h	Make the Makefile a dependency of default targets for nmake	2019-02-04 08:10:25 +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	QRegExp include cleanup	2019-04-19 21:21:17 +00:00
metamakefile.h	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
projectgenerator.cpp	Enable deprecation warnings by default	2019-02-02 02:31:05 +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