Merge "Add back revokeTrust()" into qt-dev