Merge "qtaguid.cpp - improvements"