diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-12-01 08:33:24 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-12-02 19:53:13 +0100 |
| commit | 665db9b9aab765dfdda129202b3b4d085b4a89b6 (patch) | |
| tree | 098bf5f56971c09313c618f02b2ee77c054adf7b | |
| parent | 0b508c96172878373924e262461cdc7d18f9a89b (diff) | |
Doc: Fix faulty include file extension
Two qdoc files included a .cmake file that contained qdoc markup. After
.cmake files got license headers, the license header showed up in the
flow content of the documentation.
Rename the .cmake file to .qdocinc and adjust the license header to be
in line with the rest of the documentation.
This amends commit 0d276381135ed5724464cb784f3d17775ac4d764.
Pick-to: 6.4
Change-Id: I5d5487387bf1d2b1627db93764e4e45f34a13d4e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/qml/doc/src/cmake/qt_deploy_qml_imports.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/cmake/qt_generate_deploy_qml_app_script.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/includes/cmake-qml-qt-finalize-target-warning.qdocinc (renamed from src/qml/doc/src/includes/cmake-qml-qt-finalize-target-warning.cmake) | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/doc/src/cmake/qt_deploy_qml_imports.qdoc b/src/qml/doc/src/cmake/qt_deploy_qml_imports.qdoc index cb2f90a8a9..50fed64a9a 100644 --- a/src/qml/doc/src/cmake/qt_deploy_qml_imports.qdoc +++ b/src/qml/doc/src/cmake/qt_deploy_qml_imports.qdoc @@ -18,7 +18,7 @@ project. \preliminarycmakecommand -\include cmake-qml-qt-finalize-target-warning.cmake +\include cmake-qml-qt-finalize-target-warning.qdocinc \section1 Synopsis diff --git a/src/qml/doc/src/cmake/qt_generate_deploy_qml_app_script.qdoc b/src/qml/doc/src/cmake/qt_generate_deploy_qml_app_script.qdoc index 17a2e5993e..4254b69102 100644 --- a/src/qml/doc/src/cmake/qt_generate_deploy_qml_app_script.qdoc +++ b/src/qml/doc/src/cmake/qt_generate_deploy_qml_app_script.qdoc @@ -15,7 +15,7 @@ \cmakecommandsince 6.3 \preliminarycmakecommand -\include cmake-qml-qt-finalize-target-warning.cmake +\include cmake-qml-qt-finalize-target-warning.qdocinc \section1 Synopsis diff --git a/src/qml/doc/src/includes/cmake-qml-qt-finalize-target-warning.cmake b/src/qml/doc/src/includes/cmake-qml-qt-finalize-target-warning.qdocinc index 5391ad4c16..9152726398 100644 --- a/src/qml/doc/src/includes/cmake-qml-qt-finalize-target-warning.cmake +++ b/src/qml/doc/src/includes/cmake-qml-qt-finalize-target-warning.qdocinc @@ -1,5 +1,5 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only \warning If you are using a CMake version lower than 3.19, make sure that you pass the \c MANUAL_FINALIZATION option to |