Liang Qi 4dd8a63fc1 Merge remote-tracking branch 'origin/5.5.0' into 5.5 ... Conflicts: src/plugins/platforms/cocoa/qcocoafiledialoghelper.h Manually fixed src/testlib/qtestcase.cpp to return the right type. Change-Id: Id1634dbe3d73fefe9431b9f5378846cb187624e4		2015-06-27 13:54:35 +02:00
..
mac	pbuilder_pbx: disable bit code for Xcode projects	2015-06-16 11:33:47 +00:00
unix	don't process .prl files recursively	2015-06-01 13:27:06 +00:00
win32	Merge remote-tracking branch 'origin/5.5.0' into 5.5	2015-06-27 13:54:35 +02: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