Merge "Fix can't create thumbnail and wrong orientation issue" into qt-dev