a little .pro modification and bug fix
Merge remote-tracking branch 'origin/master'
fix linux .pro problem