Merge "Fix CodeInspectionTest" into qt-dev