[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-186-g29dd8a8

[Brad King]

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  29dd8a8ff8ca44b8bcc6af4ad0496106cd72c5c3 (commit)
       via  e50c9bfaa1afea809b4a4c385f5d1ed1bbf5ff63 (commit)
      from  bb186170a4954d219bc2e799df8d7caa77a88ac0 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29dd8a8ff8ca44b8bcc6af4ad0496106cd72c5c3
commit 29dd8a8ff8ca44b8bcc6af4ad0496106cd72c5c3
Merge: bb18617 e50c9bf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 9 13:21:11 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 9 13:21:11 2016 -0400

    Merge topic 'cmake-gui-osx-symlink-qt5-plugin' into next
    
    e50c9bfa fixup! cmake-gui: Teach Qt5 where plugins are when launched through a symlink


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e50c9bfaa1afea809b4a4c385f5d1ed1bbf5ff63
commit e50c9bfaa1afea809b4a4c385f5d1ed1bbf5ff63
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 9 13:20:57 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 9 13:20:57 2016 -0400

    fixup! cmake-gui: Teach Qt5 where plugins are when launched through a symlink

diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx
index 6035822..c849d52 100644
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@@ -231,7 +231,7 @@ static int cmOSXInstall(std::string dir)
 // We need to resolve all symlinks so we have a known relative path between
 // MacOS/CMake and the PlugIns directory.
 //
-// Note we are using cmSystemTools sine Qt can't provide the path to the
+// Note we are using cmSystemTools since Qt can't provide the path to the
 // executable before the QApplication is created, and that is when plugin
 // searching occurs.
 static void cmAddPluginPath()

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

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


hooks/post-receive
-- 
CMake