qtcreator project was edited so as to include stdafx.h from VS in the
make system
fixing merge odds