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
..
doc	Adding qmake doc details for generating rc files	2015-04-15 10:33:25 +00:00
generators	Merge remote-tracking branch 'origin/5.5.0' into 5.5	2015-06-27 13:54:35 +02:00
library	add qmake evaluator test	2015-05-20 18:11:34 +00:00
cachekeys.h	Update copyright headers	2015-02-11 06:49:51 +00:00
main.cpp	fix installing unix dll symlinks on windows hosts	2015-06-01 13:26:57 +00:00
Makefile.unix	fix distclean targets	2015-04-23 19:16:57 +00:00
Makefile.win32	fix distclean targets	2015-04-23 19:16:57 +00:00
meta.cpp	fix quoting issues. all of them. (*)	2015-02-17 18:27:29 +00:00
meta.h	Update copyright headers	2015-02-11 06:49:51 +00:00
option.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
option.h	Update copyright headers	2015-02-11 06:49:51 +00:00
project.cpp	make fileFixify() calling convention somewhat sane	2015-04-21 12:06:20 +00:00
project.h	make fileFixify() calling convention somewhat sane	2015-04-21 12:06:20 +00:00
property.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
property.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qmake_pch.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qmake-docs.pro	move qmake docs into qtbase	2013-06-17 15:41:55 +02:00
qmake.pri	nuke gbuild generator	2015-02-02 11:14:34 +00:00
qmake.pro	bring fake qmake project up to snuff	2013-11-04 19:50:07 +01:00