Merge "Clean up the permission control code in framework" into qt-dev