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
..
.gitignore
BLACKLIST	Blacklist tst_QItemDelegate::enterKey tests on openSUSE 42.3	2017-09-22 14:34:30 +00:00
qitemdelegate.pro	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-01 18:20:00 +02:00
tst_qitemdelegate.cpp	Allow QImage with more than 2GByte of image data	2017-07-08 08:17:13 +00:00