This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 6110d7b92e0593a01a9b3f94dcb0ddd90f0b0cae (commit) via 649789a736bb217f818696eae36ee6e6a2e1aa61 (commit) from 383f94597d77fc1549e88e16e7a5ddb9b752b398 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6110d7b92e0593a01a9b3f94dcb0ddd90f0b0cae commit 6110d7b92e0593a01a9b3f94dcb0ddd90f0b0cae Merge: 383f945 649789a Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Mon Mar 10 23:09:22 2014 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Mar 10 23:09:22 2014 -0400 Merge topic 'unicode-cmake-gui' into next 649789a7 Unicode: cmake-gui encoding now matches KWSys encoding. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=649789a736bb217f818696eae36ee6e6a2e1aa61 commit 649789a736bb217f818696eae36ee6e6a2e1aa61 Author: Clinton Stimpson <clin...@elemtech.com> AuthorDate: Thu Mar 6 23:23:52 2014 -0700 Commit: Clinton Stimpson <clin...@elemtech.com> CommitDate: Mon Mar 10 21:08:43 2014 -0600 Unicode: cmake-gui encoding now matches KWSys encoding. A UTF-8 QTextCodec is used with QString when KWSys is configured to treat strings as UTF-8. This means QString::toLocal8Bit() will convert to UTF-8. diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index 4308a4d..0dd01d8 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -55,6 +55,11 @@ else() endif() endif() + +if(WIN32 AND KWSYS_ENCODING_DEFAULT_CODEPAGE MATCHES CP_UTF8) + add_definitions(-DKWSYS_CP_UTF8) +endif() + set(SRCS AddCacheEntry.cxx AddCacheEntry.h diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index 821121e..995929e 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -14,6 +14,7 @@ #include <QDir> #include <QTranslator> #include <QLocale> +#include <QTextCodec> #include "QMacInstallDialog.h" #include "CMakeSetupDialog.h" #include "cmDocumentation.h" @@ -78,6 +79,13 @@ int main(int argc, char** argv) QApplication app(argc, 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 // when creating Mac bundles, it potentially causes problems foreach(QString p, QApplication::libraryPaths()) ----------------------------------------------------------------------- Summary of changes: Source/QtDialog/CMakeLists.txt | 5 +++++ Source/QtDialog/CMakeSetup.cxx | 8 ++++++++ 2 files changed, 13 insertions(+) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits