Liang Qi d0eaa737e1 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/tools/qstring.h src/gui/image/qimagereader.cpp src/network/access/qnetworkaccessmanager.cpp src/tools/qdoc/doc/examples/examples.qdoc src/widgets/accessible/qaccessiblewidgetfactory_p.h src/widgets/doc/qtwidgets.qdocconf Change-Id: I8fae62283aebefe24e5ca4b4abd97386560c0fcb		2015-10-02 16:59:55 +02:00
..
doc	Doc: fixed links to qmake documentation	2015-09-25 10:57:51 +00:00
generators	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-10-02 16:59:55 +02:00
library	qmake: mark some types movable	2015-07-08 12:31:00 +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	Deinline QRingBuffer class	2015-05-20 13:49:00 +00:00
Makefile.win32	Deinline QRingBuffer class	2015-05-20 13:49:00 +00:00
meta.cpp	remove QMakeMetaInfo::clear()	2015-10-01 16:19:43 +00:00
meta.h	remove QMakeMetaInfo::clear()	2015-10-01 16:19:43 +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