Merge "Don't check qtaguid file unless using them"