Liang Qi ce9519593a Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: mkspecs/android-g++/qmake.conf qmake/generators/unix/unixmake2.cpp src/gui/image/qimage_conversions.cpp Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0		2015-03-31 10:03:31 +02:00
..
mac	Add XCTest logger backend to QtTestLib	2015-03-27 16:53:43 +00:00
unix	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
win32	add DISTFILES support for Visual Studio projects	2015-03-27 13:38:15 +00:00
makefile.cpp	untangle handling extra compiler .clean member	2015-02-17 18:27:51 +00:00
makefile.h	fix quoting issues. all of them. (*)	2015-02-17 18:27:29 +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	fix filename handling in replaceExtraCompilerVariables()	2015-02-17 18:27:25 +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