Merge "Removes obsolete alpha modifications" into qt-dev