Fixage
Merge branch 'refs/heads/cmake' into qtfred