Merge "Reset the texture coordinates and also take aspect ratio into account." into qt-dev