[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-936-g0d26165

[Clinton Stimpson]

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  0d2616536a4815b4859ceb7770f8f7cbdaacd2f5 (commit)
       via  c34216cf8a265b617d4422d772187e38e57647ba (commit)
      from  f2fe9c29893e343aceaa637f2982502b8f1bbb46 (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=0d2616536a4815b4859ceb7770f8f7cbdaacd2f5
commit 0d2616536a4815b4859ceb7770f8f7cbdaacd2f5
Merge: f2fe9c2 c34216c
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Mar 12 22:51:33 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 12 22:51:33 2014 -0400

    Merge topic 'unicode-cmake-gui' into next
    
    c34216cf cmake-gui: Fix compile with Qt5 using UTF-8 internal encoding.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c34216cf8a265b617d4422d772187e38e57647ba
commit c34216cf8a265b617d4422d772187e38e57647ba
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Mar 12 20:48:46 2014 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Mar 12 20:48:46 2014 -0600

    cmake-gui: Fix compile with Qt5 using UTF-8 internal encoding.
    
    Because we already call [to|from]Local8Bit() with C strings where we are supposed to,
    we do not need to specify UTF-8 encoding when converting C strings to QString.

diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 995929e..1b04a00 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/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

-----------------------------------------------------------------------

Summary of changes:
 Source/QtDialog/CMakeSetup.cxx |    2 --
 1 file changed, 2 deletions(-)


hooks/post-receive
-- 
CMake