Updated makefile and pro file