Liang Qi bc5f45052f Merge remote-tracking branch 'origin/5.9' into 5.10 ... Conflicts: src/corelib/global/qconfig-bootstrapped.h src/corelib/global/qglobal.h src/corelib/tools/qcryptographichash.cpp src/corelib/tools/qcryptographichash.h src/corelib/tools/qmessageauthenticationcode.cpp src/plugins/platforms/windows/qwindowswindow.h tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST Change-Id: Ib68112de985a3d714c2071f47c10e907e4f0229a		2017-10-04 13:41:04 +02:00
..
assets	WinRT: Refactor icon specification usage	2015-01-13 11:29:42 +01:00
manifests/10.0	winrt: Update capability management	2017-07-03 05:32:53 +00:00
qmake.conf	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-10-04 13:41:04 +02:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00