Liang Qi bce25a6340 Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: src/gui/painting/qcoregraphics.mm src/gui/painting/qcoregraphics_p.h src/plugins/platforms/cocoa/qcocoahelpers.h src/plugins/platforms/cocoa/qcocoahelpers.mm Change-Id: Ibe5efcae73526b3d3931ed22730b13d372dcf54e		2016-11-25 14:41:29 +01:00
..
mac	Replace QCFString::to(CF/NS/Q)String usage with QString methods	2016-10-06 08:02:59 +00:00
unix	Enable precompiled headers on iOS, tvOS, watchOS	2016-09-02 08:25:31 +00:00
win32	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-25 14:41:29 +01:00
makefile.cpp	qmake: fix file name treatment in emission of extra targets	2016-11-15 22:44:09 +00:00
makefile.h	qmake: Mark MakefileGenerator::Compiler as Q_MOVABLE_TYPE	2016-08-15 22:16:59 +00:00
makefiledeps.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-01 06:02:55 +01:00
makefiledeps.h	qmake: replace a uint:1 with a bool	2016-08-15 22:16:09 +00:00
metamakefile.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-29 17:55:20 +02:00
metamakefile.h	Updated license headers	2016-01-21 18:55:18 +00:00
projectgenerator.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
projectgenerator.h	Updated license headers	2016-01-21 18:55:18 +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