Merge "Maintain legacy signatures" into qt-dev