Merge "rename vendor proprietary name XTRA to PSDS" into qt-dev