Merge topic 'unicode-cmake-gui'

c34216cf cmake-gui: Fix compile with Qt5 using UTF-8 internal encoding.

Source/QtDialog/CMakeSetup.cxx

@@ -81,9 +81,7 @@ int main(int argc, char** argv)
 
 #if defined(KWSYS_CP_UTF8)
   QTextCodec* utf8_codec = QTextCodec::codecForName("UTF-8");
-  QTextCodec::setCodecForCStrings(utf8_codec);
   QTextCodec::setCodecForLocale(utf8_codec);
-  QTextCodec::setCodecForTr(utf8_codec);
 #endif
 
   // clean out standard Qt paths for plugins, which we don't use anyway