diff options
| author | Lucie Gérard <lucie.gerard@qt.io> | 2024-02-27 15:10:07 +0100 |
|---|---|---|
| committer | Lucie Gérard <lucie.gerard@qt.io> | 2024-03-20 15:24:07 +0100 |
| commit | 402e47745636a36419b021385f137f5ceaa65f48 (patch) | |
| tree | 13873ed4278337d21da56fe800e8d37695c81509 | |
| parent | 03f949dcf8d4060f66b1f91a1ff314a4dc7262f3 (diff) | |
Rename files for header generation
Pick-to: 6.7
Task-number: QTBUG-121039
Change-Id: I45eec26e93e5aa3e4a08ef4b326427338f63e3f2
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
| -rw-r--r-- | src/gui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/gui/vulkan/licenseheader.h.in (renamed from src/gui/vulkan/generated_header.txt) | 0 | ||||
| -rwxr-xr-x | src/tools/moc/util/generate.sh | 4 | ||||
| -rw-r--r-- | src/tools/moc/util/licenseheader.cpp.in (renamed from src/tools/moc/util/licenseheader.txt) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 2df1baf3cd..3089781d62 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -908,7 +908,7 @@ if (QT_FEATURE_vulkan) list(APPEND vulkan_fun_command_content COMMAND "${qvkgen}" "${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vk.xml" - "${CMAKE_CURRENT_SOURCE_DIR}/vulkan/generated_header.txt" + "${CMAKE_CURRENT_SOURCE_DIR}/vulkan/licenseheader.h.in" "${CMAKE_CURRENT_BINARY_DIR}/vulkan/qvulkanfunctions" DEPENDS vulkan/vk.xml ${qvkgen} COMMENT "Generating vulkan data" diff --git a/src/gui/vulkan/generated_header.txt b/src/gui/vulkan/licenseheader.h.in index 3b6a0ea72a..3b6a0ea72a 100644 --- a/src/gui/vulkan/generated_header.txt +++ b/src/gui/vulkan/licenseheader.h.in diff --git a/src/tools/moc/util/generate.sh b/src/tools/moc/util/generate.sh index 4514ca4930..6be06e5a91 100755 --- a/src/tools/moc/util/generate.sh +++ b/src/tools/moc/util/generate.sh @@ -6,7 +6,7 @@ set -ex qmake make -cat licenseheader.txt > ../keywords.cpp -cat licenseheader.txt > ../ppkeywords.cpp +cat licenseheader.cpp.in > ../keywords.cpp +cat licenseheader.cpp.in > ../ppkeywords.cpp ./generate_keywords >> ../keywords.cpp ./generate_keywords preprocessor >> ../ppkeywords.cpp diff --git a/src/tools/moc/util/licenseheader.txt b/src/tools/moc/util/licenseheader.cpp.in index 42958a66f5..42958a66f5 100644 --- a/src/tools/moc/util/licenseheader.txt +++ b/src/tools/moc/util/licenseheader.cpp.in |