Merge "Handle removed classes when looking for deprecated at birth APIs." into qt-dev