Merging master to gsoc21-qt6-port

[Anjani Kumar]

Hi all,

I merged master to gsoc21-qt6-branch resolving many conflicts. I was
wondering if it would be okay to push more commits to branch
"gsoc21-qt6-port". Maybe it should be kept as it is for historical
purposes. Please let me know. Or else I would push a new branch for the
active Qt6 porting process, branching from "gsoc21-qt6-port".

Thanks
Anjani
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/digikam-devel/attachments/20210906/82b6e264/attachment.htm>