Reland r496041 and r496054.
With r496296 we no longer have naming conflicts and can define the wayland component in qt.mk again.