Browse Source

cmake-gui: Restore support for internationalization with Qt5 on Windows

Restore the logic removed by commit 035078d847 (cmake-gui: Remove
explicit locale setup, 2020-12-17, v3.20.0-rc1~205^2~6), but only with
Qt5 on Windows.  Leave a FIXME comment to support Qt6 later.

Fixes: #23562
Issue: #23565
Brad King 3 years ago
parent
commit
ae13524e3b
1 changed files with 14 additions and 0 deletions
  1. 14 0
      Source/QtDialog/CMakeSetup.cxx

+ 14 - 0
Source/QtDialog/CMakeSetup.cxx

@@ -10,6 +10,15 @@
 #include <QTranslator>
 #include <QtPlugin>
 
+// FIXME(#23565): Qt6 has QTextCodec in Core5Compat, but using its
+// `setCodecForLocale` does not make cmake-gui support non-ASCII chars
+// on Windows.  For now we only support them with Qt5.  How do we support
+// them with Qt6, preferably without Core5Compat?
+#if defined(Q_OS_WIN) && (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+#  include <QTextCodec>
+#  define CMAKE_HAVE_QTEXTCODEC
+#endif
+
 #include "cmsys/CommandLineArguments.hxx"
 #include "cmsys/Encoding.hxx"
 #include "cmsys/SystemTools.hxx"
@@ -121,6 +130,11 @@ int main(int argc, char** argv)
 
   setlocale(LC_NUMERIC, "C");
 
+#ifdef CMAKE_HAVE_QTEXTCODEC
+  QTextCodec* utf8_codec = QTextCodec::codecForName("UTF-8");
+  QTextCodec::setCodecForLocale(utf8_codec);
+#endif
+
   // tell the cmake library where cmake is
   QDir cmExecDir(QApplication::applicationDirPath());
 #if defined(Q_OS_MAC)