Merge "Revert "Revert "Removing deprecated APIs added to Q""" into qt-dev
am: 028b649f71

Change-Id: Iaea4b1d980a21469a74f6571b7e41c4db070594f