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

Change-Id: I8d939062c7f4f77dd5dfaca5633bb66c06bf4b42