continuation of qt5 compilation cleanup !
Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'