Plain Diff
Conflicts: src/plugins/imageformats/webp/qwebphandler.cpp Change-Id: I494e140819746c83e586bea72d8b02a7d245d970