Merge branch 'master' into 3.0.0
author Gilles Caulier
()
committer Gilles Caulier
()
commit 3efb0abf496882c16bdc04e0f74de79e781bc385
tree 14e6ba736425443377202c2e74f8447c6708c880
parent 6b95608ef44954cb145cfdef6e569a3c4d289661
parent 4e4244b1446a4908bea942b327f0231164f0aca4
Merge branch 'master' into 3.0.0
NEWS
libs/widgets/itemview/itemviewimagedelegate.cpp
libs/widgets/itemview/itemviewimagedelegate.h