Added socks to osx makefile
Updating qmake template
merge