Merge "Re-mark addPrivateFlags as UnsupportedAppUsage" into qt-dev