Commit 9737b35a authored by Gunnar Sletta's avatar Gunnar Sletta
Browse files

Merge branch '5.3' into dev

Conflicts:
	src/quick/items/context2d/qquickcontext2d.cpp
	src/quick/items/context2d/qquickcontext2dtexture.cpp

Change-Id: I1a9b911b3a92333a5dddbaf43275f71bad2006f0
parents 0a43c561 3f5141e5
No related merge requests found
Showing with 487 additions and 45 deletions
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