Merge "Protect against mConfigs changes in writeXml" into qt-dev