Fixes to botched Qwt 6.1 update

This fixes compilation on Linux, so here's hoping it fixes all platforms. TC must pass before this should be merged.