From 8d1d4f94793af0e021c6f076c036bd83cca326e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucie=20G=C3=A9rard?= Date: Tue, 27 Feb 2024 15:10:07 +0100 Subject: [PATCH] Rename files for header generation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-121039 Change-Id: I45eec26e93e5aa3e4a08ef4b326427338f63e3f2 Reviewed-by: Kai Köhne (cherry picked from commit 402e47745636a36419b021385f137f5ceaa65f48) Reviewed-by: Qt Cherry-pick Bot --- src/gui/CMakeLists.txt | 2 +- src/gui/vulkan/{generated_header.txt => licenseheader.h.in} | 0 src/tools/moc/util/generate.sh | 4 ++-- .../moc/util/{licenseheader.txt => licenseheader.cpp.in} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename src/gui/vulkan/{generated_header.txt => licenseheader.h.in} (100%) rename src/tools/moc/util/{licenseheader.txt => licenseheader.cpp.in} (100%) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 3207244afd2..8ea68087cf9 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -906,7 +906,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 similarity index 100% rename from src/gui/vulkan/generated_header.txt rename to src/gui/vulkan/licenseheader.h.in diff --git a/src/tools/moc/util/generate.sh b/src/tools/moc/util/generate.sh index 4514ca4930b..6be06e5a916 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 similarity index 100% rename from src/tools/moc/util/licenseheader.txt rename to src/tools/moc/util/licenseheader.cpp.in