Liang Qi 6a772fd201 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: .qmake.conf mkspecs/common/msvc-desktop.conf mkspecs/win32-g++/qmake.conf mkspecs/win32-icc/qmake.conf src/platformsupport/fontdatabases/mac/coretext.pri src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655		2017-05-29 10:54:41 +02:00
..
assets	WinRT: Refactor icon specification usage	2015-01-13 11:29:42 +01:00
manifests/10.0	Remove support for WinRT 8.1 and Windows Phone 8.1	2017-01-18 12:38:56 +00:00
qmake.conf	Merge remote-tracking branch 'origin/5.9' into dev	2017-05-29 10:54:41 +02:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00