Small makefile rework
More cleanup, go back to use Qt4 for parented UIs