update qt5 to 5.4

I have re-added the bottle block..