Merge changes from QtDesctop fork