Changes to support qwt-6.1.0