diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-26 01:00:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-26 01:00:13 +0200 |
| commit | 0dff40adf81d0bc2023c109abf266053431bfcd0 (patch) | |
| tree | 85776cb125584759b706f45f1465bd5d3d9ccfe4 /doc | |
| parent | 7db9e02ad11c391c1d616defd11e7deb2718d60a (diff) | |
| parent | 913dd26c92f406e3da83ed83701ce47e659bcc48 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I6ecf7074eda57ef4954fb3fdc7a6d1e8cd229340
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/global/externalsites/external-resources.qdoc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc index 6019f5013f..01c6939dca 100644 --- a/doc/global/externalsites/external-resources.qdoc +++ b/doc/global/externalsites/external-resources.qdoc @@ -62,28 +62,27 @@ */ /*! - \externalpage http://www.cmake.org/cmake/help/v2.8.11/cmake.html#command:find_package + \externalpage https://cmake.org/cmake/help/latest/command/find_package.html \title CMake find_package Documentation */ /*! - \externalpage http://www.cmake.org/cmake/help/v2.8.11/cmake.html#prop_tgt:AUTOMOC + \externalpage https://cmake.org/cmake/help/latest/manual/cmake-qt.7.html#automoc \title CMake AUTOMOC Documentation */ - /*! - \externalpage http://www.cmake.org/cmake/help/v2.8.11/cmake.html#prop_tgt:LOCATION + \externalpage https://cmake.org/cmake/help/latest/prop_tgt/LOCATION.html \title CMake LOCATION Documentation */ /*! - \externalpage http://www.cmake.org/cmake/help/v2.8.11/cmake.html#prop_tgt:POSITION_INDEPENDENT_CODE + \externalpage https://cmake.org/cmake/help/latest/prop_tgt/POSITION_INDEPENDENT_CODE.html \title CMake POSITION_INDEPENDENT_CODE Documentation */ /*! - \externalpage http://www.cmake.org/cmake/help/v2.8.11/cmake.html#command:target_link_libraries + \externalpage https://cmake.org/cmake/help/latest/command/target_link_libraries.html \title CMake target_link_libraries Documentation */ |