mergin trunk into testing qt r5