Liang Qi 4456984da7 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: tests/auto/corelib/io/qfile/tst_qfile.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/tools/qversionnumber/qversionnumber.pro Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e		2015-10-14 15:45:35 +02:00
..
doc	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-14 15:45:35 +02:00
generators	QtCore/qmake: drop some unneeded QChar -> QString conversions	2015-10-11 12:29:28 +00: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	make .prl processing less convoluted	2015-10-02 14:01:13 +00:00
meta.h	make .prl processing less convoluted	2015-10-02 14:01:13 +00:00
option.cpp	Distinguish between Objective-C and Objective-C++ sources	2015-10-09 15:15:17 +00:00
option.h	Distinguish between Objective-C and Objective-C++ sources	2015-10-09 15:15:17 +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