diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-08-26 11:50:46 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-08-30 00:41:40 +0200 |
| commit | 39cea8900b02479aca222ba1f4b4bc54a9c27f02 (patch) | |
| tree | d050dd23ecef8f2a48ad34a1dfa2ffe47574782e /src/corelib | |
| parent | 5ff637cc140abc07c4c7934fcd6a048a3d0aa66f (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 87bcb9ca6ec883afb86165a282557014c9f06e41.
Change-Id: Ie9b02c75b67791c60cc8e054b52a15ffa9cf3e32
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/doc/src/cmake/qt_add_executable.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/doc/src/cmake/qt_finalize_project.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/doc/src/includes/cmake-android-qt-finalize-project-warning.qdocinc (renamed from src/corelib/doc/src/includes/cmake-android-qt-finalize-project-warning.cmake) | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/doc/src/cmake/qt_add_executable.qdoc b/src/corelib/doc/src/cmake/qt_add_executable.qdoc index a09ecc8dfd..4bfd938c3b 100644 --- a/src/corelib/doc/src/cmake/qt_add_executable.qdoc +++ b/src/corelib/doc/src/cmake/qt_add_executable.qdoc @@ -101,5 +101,5 @@ for finalizing the target by adding the \c{MANUAL_FINALIZATION} keyword. \snippet cmake-macros/examples.cmake qt_add_executable_deferred -\include cmake-android-qt-finalize-project-warning.cmake +\include cmake-android-qt-finalize-project-warning.qdocinc */ diff --git a/src/corelib/doc/src/cmake/qt_finalize_project.qdoc b/src/corelib/doc/src/cmake/qt_finalize_project.qdoc index dc63e66cd6..54eb55528b 100644 --- a/src/corelib/doc/src/cmake/qt_finalize_project.qdoc +++ b/src/corelib/doc/src/cmake/qt_finalize_project.qdoc @@ -34,7 +34,7 @@ With CMake versions 3.19 and higher, you don't need to call this command since it consists of sub-commands that are ordinarily invoked at the end of \c CMAKE_SOURCE_DIR scope. -\include cmake-android-qt-finalize-project-warning.cmake +\include cmake-android-qt-finalize-project-warning.qdocinc \section2 Examples diff --git a/src/corelib/doc/src/includes/cmake-android-qt-finalize-project-warning.cmake b/src/corelib/doc/src/includes/cmake-android-qt-finalize-project-warning.qdocinc index 02096fc1ec..3f2a4ab6ec 100644 --- a/src/corelib/doc/src/includes/cmake-android-qt-finalize-project-warning.cmake +++ b/src/corelib/doc/src/includes/cmake-android-qt-finalize-project-warning.qdocinc @@ -1,5 +1,5 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only \warning If your \e Android project is built using a CMake version lower than 3.19, make sure that you call \l{qt_finalize_project}{qt6_finalize_project()} at |