Merge "Correct pointer position" into qt-dev