Liang Qi b94773c9c8 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: config.tests/unix/compile.test src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/testlib/qtestcase.cpp src/testlib/qtestcase.qdoc Change-Id: Ied3c471dbc9a076c8de33d673bd557e88575609d		2016-04-13 06:55:37 +02: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: Add capabilities as specified by modules	2016-04-07 20:03:55 +00:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00