Merge "Fix broken tests" into qt-dev