Liang Qi d3e6e732c7 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: config.tests/unix/compile.test src/plugins/platforms/cocoa/qcocoahelpers.mm src/tools/qlalr/cppgenerator.cpp Change-Id: I0103ca076a9aca7118b2fd99f0fdaf81055998c3		2016-02-02 15:57:44 +01:00
..
assets	WinRT: Refactor icon specification usage	2015-01-13 11:29:42 +01:00
manifests	winrt: update version settings in default manifest	2016-01-26 13:03:48 +00:00
qmake.conf	winrt: Use winsock2 API for hostname resolution on WinRT/WinPhone	2016-01-05 08:14:31 +00:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00