more packaging fixes around qmake Makefile genreation