Fully restore compat with Qt 5.5

Authored by kfunk on Oct 9 2017, 9:19 AM.