Initial run of changes for Qt5.