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