Fix typo in gcc opts
Merge remote-tracking branch 'upstream/master' into cmake_qt5