Merge "qtaguid test: 64-bit compile issues"