Merge "Revert "Revert "Removing deprecated APIs added to Q""" into qt-dev