Remaining changes, Qt 5 compatibility fixes
Updated windows daemon makefile