Liang Qi 6bc1ce9c16 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: src/corelib/kernel/qcfsocketnotifier.cpp src/tools/qdoc/qdocindexfiles.cpp Change-Id: Iae365b23afc611de8794f22cceae8b210d25aa8a		2015-10-23 23:14:22 +02:00
..
mac	Distinguish between Objective-C and Objective-C++ sources	2015-10-09 15:15:17 +00:00
unix	support relative paths in QMAKE_RPATHDIR	2015-10-20 17:18:16 +00:00
win32	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-10-23 23:14:22 +02:00
makefile.cpp	fix bogus complaints about prl targets without extension in bundles	2015-10-14 15:43:26 +00:00
makefile.h	merge MingwMakefileGenerator::findLibraries() into Win32MakefileGenerator	2015-10-02 14:01:24 +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	QtCore/qmake: drop some unneeded QChar -> QString conversions	2015-10-11 12:29:28 +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