diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-26 17:24:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-26 17:24:10 (GMT) |
| commit | 8272bbc0e47d94e6200b78a4040c874659d6c10a (patch) | |
| tree | c4922caa072fb861861892b16f2df481440a92e0 | |
| parent | a48de7d8506325e7f27c9dada578744e1ff3fb35 (diff) | |
| parent | dcfbbe87eb1d1fc748b794f105285523d3b12b1b (diff) | |
| download | CMake-8272bbc0e47d94e6200b78a4040c874659d6c10a.zip CMake-8272bbc0e47d94e6200b78a4040c874659d6c10a.tar.gz CMake-8272bbc0e47d94e6200b78a4040c874659d6c10a.tar.bz2 | |
Merge branch 'fix-Qt-manual-typo' into release
| -rw-r--r-- | Help/manual/cmake-qt.7.rst | 2 |
1 files changed, 1 insertions, 1 deletions
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. |