Fixup
Merge branch 'dev' into 5.4
There is no Qt3D 5.4 branch.
qtpim is dev only for now.
Merge branch 'dev' into 5.4
Merge branch '5.4' into 5.3