[Cmake-commits] CMake branch, next, updated. v2.8.1-1221-gfa81b76

[cmake-commits at cmake.org]

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  fa81b760087a8adda32fe127a8316f880e8efd70 (commit)
       via  45d7200a73edc947b6e3672bc7cff65143b82179 (commit)
       via  6138ff02edc05e68c5dea8b3c38f5359bda977bb (commit)
       via  3d784cc7528672b68e07e65c7287d4db1a12b79f (commit)
      from  1cab21c61572ff585141a8dd03bb6b0c61644972 (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=fa81b760087a8adda32fe127a8316f880e8efd70
commit fa81b760087a8adda32fe127a8316f880e8efd70
Merge: 1cab21c 45d7200
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Wed May 19 15:41:15 2010 -0600

    Merge branch 'qtdialog' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45d7200a73edc947b6e3672bc7cff65143b82179
commit 45d7200a73edc947b6e3672bc7cff65143b82179
Author: Clinton Stimpson <clinton at elemtech.com>
Date:   Wed May 19 15:40:48 2010 -0600

    Fix for fix to bug #9975

diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index fc61709..28f4697 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -164,7 +164,7 @@ int main(int argc, char** argv)
     QStringList args = app.arguments();
     if(args.count() == 2)
       {
-      cmsys_stl::string filePath = cmSystemTools::CollapseFullPath("..");
+      cmsys_stl::string filePath = cmSystemTools::CollapseFullPath(args[1].toAscii().data());
       cmsys_stl::string buildFilePath =
         cmSystemTools::CollapseFullPath("CMakeCache.txt", filePath.c_str());
       cmsys_stl::string srcFilePath =

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

Summary of changes:
 Source/QtDialog/CMakeSetup.cxx    |    2 +-
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake