I will submit patches pending for upstream inclusion soon (for Leap with Plasma 5.5.4 update, for TW ASAP - first we need qtbase accepted)