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
..
doc	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
generators	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
library	add autotest for qmake parser	2015-02-25 13:55:12 +00:00
cachekeys.h	Update copyright headers	2015-02-11 06:49:51 +00:00
main.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
Makefile.unix	nuke gbuild generator	2015-02-02 11:14:34 +00:00
Makefile.win32	nuke gbuild generator	2015-02-02 11:14:34 +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	Update copyright headers	2015-02-11 06:49:51 +00:00
project.h	Update copyright headers	2015-02-11 06:49:51 +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