Merge pull request #732 from Susurrus/master

Fixes to botched Qwt 6.1 update