Merge "Avoid using usap when wrap property set." into qt-dev