intermediate changes to Qt 5.1 (not complete, functionality is broken)