Merge "Optimize test cases" into qt-dev