Fix Qt5 support & Fix/add "make install" after using qmake

Nothing major broken for Qt5, just some includes using the old style stops it compiling