Commit 01882817 authored by Liang Qi's avatar Liang Qi
Browse files

Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	src/plugins/imageformats/webp/qwebphandler.cpp

Change-Id: I494e140819746c83e586bea72d8b02a7d245d970
parents 11300c62 16362da5
Showing with 8 additions and 12 deletions
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment