Liang Qi 246799d8a7 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: examples/network/network-chat/peermanager.cpp src/widgets/util/qsystemtrayicon.cpp src/widgets/util/qsystemtrayicon_qpa.cpp src/widgets/util/qsystemtrayicon_win.cpp src/widgets/util/qsystemtrayicon_x11.cpp Change-Id: I1c026df83818c0ccaf956980370e7522960627db		2017-01-30 12:46:20 +01:00
..
BLACKLIST	Blacklist tst_QPropertyAnimation::startBackwardWithoutEndValue on Windows	2015-06-20 15:25:54 +00:00
qpropertyanimation.pro	Tests: Remove CONFIG += parallel_test.	2015-09-05 07:16:50 +00:00
tst_qpropertyanimation.cpp	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-30 12:46:20 +01:00