Ignore qwtconfig.pri
merge master into personal