Merge "Workaround to let SettingsUtils handle empty settings values." into qt-dev