diff options
| author | Brad King <brad.king@kitware.com> | 2022-05-27 12:02:11 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-05-27 12:02:11 -0400 |
| commit | 5f6c4c86aa9aa874bd841d588f528122baf2c4d8 (patch) | |
| tree | d44805fec07643c49ab50a8ab733a273f0cb705c | |
| parent | d763ec0fdb52205065031ca62fc9cd2be1959e89 (diff) | |
| parent | ae13524e3bc116d38fb54770a40e89ae7274540f (diff) | |
| download | cmake-5f6c4c86aa9aa874bd841d588f528122baf2c4d8.tar.gz | |
Merge branch 'cmake-gui-locale' into release-3.22
Merge-request: !7303
| -rw-r--r-- | Source/QtDialog/CMakeSetup.cxx | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 8ffa3e728d..c556049807 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/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" @@ -124,6 +133,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) |