Changes for Qt 5.4