Updated to new qwt branch