diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2019-04-10 11:30:12 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2019-04-25 11:01:19 +0000 |
| commit | 5c1d814079fbe77e4bd02c2a00385b891a371734 (patch) | |
| tree | bc5dd4bfa67fccc9e4fdbad8e316557993dadab1 | |
| parent | 2bd21f8365eb0c199671d35acc64eb25552b2dc2 (diff) | |
Rename 'CMake Manual' to 'Building with CMake'
The name 'CMake Manual' conflicts with upstream CMake documentation.
Also, if we just talk about 'CMake' we now link to the actual CMake
documentation.
Task-number: QTBUG-72159
Change-Id: I209c7660fd881a7ac73b4260f4e8626225035bbf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| -rw-r--r-- | doc/src/development/cmake-manual.qdoc | 5 | ||||
| -rw-r--r-- | doc/src/developmenttools.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/modules.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/qtmodules.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/reference.qdoc | 1 |
5 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/development/cmake-manual.qdoc b/doc/src/development/cmake-manual.qdoc index 99b72cfef..f0511eb80 100644 --- a/doc/src/development/cmake-manual.qdoc +++ b/doc/src/development/cmake-manual.qdoc @@ -29,7 +29,8 @@ /*! \page cmake-manual.html - \title CMake Manual + \target CMake Manual + \title Building with CMake \c {CMake} is a tool that helps simplify the build process for development projects across different platforms. \c{CMake} @@ -37,7 +38,7 @@ files. \c{CMake} is a 3rd party tool with its own \l{CMake Documentation}{documentation}. - The rest of this manual details the specifics of how to use Qt 5 with \c{CMake}. + The rest of this topic details the specifics of how to use Qt 5 with \c{CMake}. The minimum version required to use Qt5 is \c{CMake} 3.1.0. \section1 Getting Started diff --git a/doc/src/developmenttools.qdoc b/doc/src/developmenttools.qdoc index dfdf1b8e3..ec2b33602 100644 --- a/doc/src/developmenttools.qdoc +++ b/doc/src/developmenttools.qdoc @@ -61,7 +61,7 @@ Qt Designer from Qt Creator in the Design mode (1). \li \l{qmake Manual}{qmake} for building applications for different target platforms. You can also use other build automation tools, - such as \l{CMake Manual}{CMake}, \l{Qbs Manual}{Qbs}, or Autotools. + such as \l{CMake Documentation}{CMake}, \l{Qbs Manual}{Qbs}, or Autotools. When using qmake or CMake, you specify the build system in the Projects mode (2). When using Qbs or Autotools, you open a .qbs or .am file in Qt Creator. diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index fbeb359bb..fe44e67b5 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -43,7 +43,7 @@ qtmain is a helper library that enables the developer to write a cross-platform main() function on Windows. If you do not use \l qmake, \l {Qbs Manual}{qbs}, or other build tools such as - \l{CMake Manual}{CMake}, then you need to link against the + \l{CMake Documentation}{CMake}, then you need to link against the \c qtmain library. The qtmain library is statically linked with the application. diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc index 38e7276d5..f322415da 100644 --- a/doc/src/qtmodules.qdoc +++ b/doc/src/qtmodules.qdoc @@ -114,7 +114,7 @@ \endcode On Windows, if you do not use \l qmake - or other build tools such as \l{CMake Manual}{CMake}, you also need to link against + or other build tools such as \l{CMake Documentation}{CMake}, you also need to link against the \c qtmain library. \section1 Qt Add-Ons diff --git a/doc/src/reference.qdoc b/doc/src/reference.qdoc index 797d9ca4b..19f541284 100644 --- a/doc/src/reference.qdoc +++ b/doc/src/reference.qdoc @@ -50,7 +50,6 @@ \li \l{Qt Assistant Manual}{Qt Assistant} \li \l{Qt Designer Manual}{Qt Designer} \li \l{qmake Manual}{qmake} - \li \l{CMake Manual}{Using Qt with CMake} \li \l{QDoc Manual}{qdoc} \endlist |