Port xconfig to Qt5 - Put back some of the old implementation(part 2).