Allan Sandfeld Jensen afac8dac58 Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: src/gui/painting/qdrawhelper.cpp src/gui/painting/qdrawhelper_p.h src/gui/painting/qdrawhelper_sse2.cpp src/gui/painting/qdrawhelper_x86_p.h Change-Id: I83256bb38ab3a705776e353bc0629315b6c59a0f		2019-08-27 13:08:38 +02:00
..
mac	qmake: Cleanup	2019-06-05 10:59:43 +02:00
unix	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-08-05 09:28:48 +02:00
win32	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-08-27 13:08:38 +02:00
makefile.cpp	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-07-20 01:00:13 +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: Cleanup	2019-06-05 10:59:43 +02: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	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-08-27 13:08:38 +02:00
projectgenerator.h	qmake: Cleanup	2019-06-05 10:59:43 +02:00
xmloutput.cpp	Fix escaping of < and > in QMake's XML generator	2019-08-12 14:46:20 +02:00
xmloutput.h	Updated license headers	2016-01-21 18:55:18 +00:00