Liang Qi fcfd31c9fd Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/global/qglobal.h Change-Id: I2c0f7544bf194f2d0f59218fd583c822901487b0		2015-06-01 17:46:58 +02:00
..
mac	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-06-01 17:46:58 +02:00
unix	move symlinking loop into the symlink container emptiness conditional	2015-05-20 18:11:44 +00:00
win32	WinRT: Add qmake support for Windows 10	2015-05-26 11:09:41 +00:00
makefile.cpp	fix quoting of qmake parameters in 'qmake' target	2015-05-22 19:04:21 +00:00
makefile.h	make fileFixify() calling convention somewhat sane	2015-04-21 12:06:20 +00:00
makefiledeps.cpp	replace incorrect uses of fixPathToLocalOS() (mostly)	2015-02-17 18:27:44 +00:00
makefiledeps.h	Update copyright headers	2015-02-11 06:49:51 +00:00
metamakefile.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
metamakefile.h	Update copyright headers	2015-02-11 06:49:51 +00:00
projectgenerator.cpp	make fileFixify() calling convention somewhat sane	2015-04-21 12:06:20 +00:00
projectgenerator.h	Update copyright headers	2015-02-11 06:49:51 +00:00
xmloutput.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
xmloutput.h	Update copyright headers	2015-02-11 06:49:51 +00:00