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
..
qnetworkproxyfactory.pro	Autotest: when using libproxy, QNetworkProxyFactory isn't generic	2017-09-13 18:42:44 +00:00
tst_qnetworkproxyfactory.cpp	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-10-04 13:41:04 +02:00