[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1459-g9a99883

Stephen Kelly steveire at gmail.com
Wed Mar 26 12:52:06 EDT 2014


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  9a998836e71fcc9451dec8bda9a5bfe922100095 (commit)
       via  dcfbbe87eb1d1fc748b794f105285523d3b12b1b (commit)
      from  2ec1efe6b116b7a04354143d707cb939a93306c2 (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=9a998836e71fcc9451dec8bda9a5bfe922100095
commit 9a998836e71fcc9451dec8bda9a5bfe922100095
Merge: 2ec1efe dcfbbe8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 26 12:52:05 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 26 12:52:05 2014 -0400

    Merge topic 'fix-Qt-manual-typo' into next
    
    dcfbbe87 Help: Fix typo in cmake-qt manual.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcfbbe87eb1d1fc748b794f105285523d3b12b1b
commit dcfbbe87eb1d1fc748b794f105285523d3b12b1b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 26 17:50:08 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 26 17:50:08 2014 +0100

    Help: Fix typo in cmake-qt manual.
    
    Do -> To.

diff --git a/Help/manual/cmake-qt.7.rst b/Help/manual/cmake-qt.7.rst
index e4c3246..cad4951 100644
--- a/Help/manual/cmake-qt.7.rst
+++ b/Help/manual/cmake-qt.7.rst
@@ -173,7 +173,7 @@ The Qt 4 and 5 :prop_tgt:`IMPORTED` targets for the QtGui libraries specify
 that the qtmain.lib static library shipped with Qt will be linked by all
 dependent executables which have the :prop_tgt:`WIN32_EXECUTABLE` enabled.
 
-Do disable this behavior, enable the ``Qt5_NO_LINK_QTMAIN`` target property for
+To disable this behavior, enable the ``Qt5_NO_LINK_QTMAIN`` target property for
 Qt 5 based targets or ``QT4_NO_LINK_QTMAIN`` target property for Qt 4 based
 targets.
 

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

Summary of changes:
 Help/manual/cmake-qt.7.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list