Liang Qi afab1546a7 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: qmake/doc/snippets/code/doc_src_qmake-manual.pro qmake/doc/src/qmake-manual.qdoc src/corelib/io/qstorageinfo_unix.cpp src/corelib/tools/qbytearray.cpp src/widgets/kernel/qwidgetwindow.cpp tests/auto/corelib/io/qprocess/tst_qprocess.cpp tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp tests/auto/network/access/qnetworkreply/BLACKLIST Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c		2015-08-26 20:06:57 +02:00
..
unixmake2.cpp	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-08-26 20:06:57 +02:00
unixmake.cpp	don't process .prl files recursively	2015-06-01 13:27:06 +00:00
unixmake.h	fix quoting issues. all of them. (*)	2015-02-17 18:27:29 +00:00