minor VideoTest modification [ci skip]
Merge branch 'master' into mdVideoThread

Conflicts:
	tests/AutoTest/VideoTest.cpp
make videotest look like master [ci skip]
_view.updateGL() => QTest::qWait(FRAME_WAIT_TIME) [ci skip]
Merge branch 'master' into mdVideoThread
FRAME_WAIT_TIME [ci skip]