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
..
images	Doc: Fixed qmake manual's images and snippets directories.	2013-08-13 01:38:54 +02:00
snippets	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-08-26 20:06:57 +02:00
src	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-14 15:45:35 +02:00
qmake.qdocconf	Doc: add navigation info to qmake Manual	2014-12-01 20:04:00 +01:00