AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Doc: Fix faulty include file extension

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2022-08-26 11:50:46 +02:00
parent 5ff637cc14
commit 39cea8900b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/doc/src/cmake/qt_add_executable.qdoc
View File

@ -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
*/

2
src/corelib/doc/src/cmake/qt_finalize_project.qdoc
View File

@ -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

4
src/corelib/doc/src/includes/cmake-android-qt-finalize-project-warning.cmake → src/corelib/doc/src/includes/cmake-android-qt-finalize-project-warning.qdocinc
View File

@ -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