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
..
Makefile.mingw	Clean up building of bootstrap lib and tools	2016-10-11 06:04:54 +00:00
Makefile.win32	Clean up building of bootstrap lib and tools	2016-10-11 06:04:54 +00:00
configure.pro	Clean up building of bootstrap lib and tools	2016-10-11 06:04:54 +00:00
configure_pch.h	Updated license headers	2016-01-21 18:55:18 +00:00
configureapp.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-24 10:31:21 +01:00
configureapp.h	configure: delete some dead code and outdated comments	2016-11-23 09:38:09 +00:00
environment.cpp	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-24 10:31:21 +01:00
environment.h	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-24 10:31:21 +01:00
main.cpp	Modularize the new configure system (infrastructure part)	2016-09-10 14:04:01 +00:00
tools.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-23 09:24:36 +01:00
tools.h	Updated license headers	2016-01-21 18:55:18 +00:00