Merge "Workaround for unsupported clipping operation" into qt-dev