update .pro
bad
Merge branch 'master' into Nicolas