Qt

Larger changes for Qt 5