1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename files for header generation

Browse Source 
Pick-to: 6.7
Task-number: QTBUG-121039
Change-Id: I45eec26e93e5aa3e4a08ef4b326427338f63e3f2
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
This commit is contained in:
Lucie Gérard 2024-02-27 15:10:07 +01:00
parent 03f949dcf8
commit 402e477456
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/CMakeLists.txt
View File

@ -908,7 +908,7 @@ if (QT_FEATURE_vulkan)
list(APPEND vulkan_fun_command_content list(APPEND vulkan_fun_command_content
COMMAND "${qvkgen}" COMMAND "${qvkgen}"
"${CMAKE_CURRENT_SOURCE_DIR}/vulkan/vk.xml" "${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" "${CMAKE_CURRENT_BINARY_DIR}/vulkan/qvulkanfunctions"
DEPENDS vulkan/vk.xml ${qvkgen} DEPENDS vulkan/vk.xml ${qvkgen}
COMMENT "Generating vulkan data" COMMENT "Generating vulkan data"

0
src/gui/vulkan/generated_header.txt → src/gui/vulkan/licenseheader.h.in
View File

4
src/tools/moc/util/generate.sh
View File

@ -6,7 +6,7 @@ set -ex
qmake qmake
make make
cat licenseheader.txt > ../keywords.cpp cat licenseheader.cpp.in > ../keywords.cpp
cat licenseheader.txt > ../ppkeywords.cpp cat licenseheader.cpp.in > ../ppkeywords.cpp
./generate_keywords >> ../keywords.cpp ./generate_keywords >> ../keywords.cpp
./generate_keywords preprocessor >> ../ppkeywords.cpp ./generate_keywords preprocessor >> ../ppkeywords.cpp

0
src/tools/moc/util/licenseheader.txt → src/tools/moc/util/licenseheader.cpp.in
View File