fix conf.pri
Merge branch 'master' into frameworks