Liang Qi 4783de0473 Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: src/network/socket/qnativesocketengine_winrt.cpp tools/configure/configureapp.cpp tools/configure/environment.cpp Change-Id: Ieae6f2ee004a87f041751852b687484f91ee4480		2016-11-24 10:31:21 +01: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.6' into 5.7	2016-06-20 08:00:26 +02:00
src	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-24 10:31:21 +01:00
qmake.qdocconf	Doc: add navigation info to qmake Manual	2014-12-01 20:04:00 +01:00