Fix merge conflicts with master in cmake_qt5