update qt5 to 5.4

Leave the bottle block as-is and we'll update when we pull.