Merge "Fix ModuleInfoProviderTest by passing correct flag" into qt-dev