[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1440-g0bb6172

[Stephen Kelly]

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  0bb6172d578b01da59370971651e931ed16ab10f (commit)
       via  852d0724019d0aae1b8f45fbe815d9e673ffc5c2 (commit)
      from  6da1f941dc80d28bc3cec0ecad399bdff7388fe6 (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=0bb6172d578b01da59370971651e931ed16ab10f
commit 0bb6172d578b01da59370971651e931ed16ab10f
Merge: 6da1f94 852d072
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 24 20:38:51 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 24 20:38:51 2014 -0400

    Merge topic 'fix-Qt-Autogen' into next
    
    852d0724 Simplify.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=852d0724019d0aae1b8f45fbe815d9e673ffc5c2
commit 852d0724019d0aae1b8f45fbe815d9e673ffc5c2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 25 01:37:01 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Mar 25 01:37:01 2014 +0100

    Simplify.

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 463a55c..a8bb317 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1969,7 +1969,7 @@ bool cmQtAutoGenerators::GenerateUi(const std::string& realName,
     }
 
   const std::string path = cmsys::SystemTools::GetFilenamePath(
-                   cmsys::SystemTools::GetRealPath(realName.c_str())) + '/';
+                                                      realName.c_str()) + '/';
 
   std::string ui_output_file = "ui_" + uiFileName + ".h";
   std::string ui_input_file = path + uiFileName + ".ui";

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

Summary of changes:
 Source/cmQtAutoGenerators.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake