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

Fix casing of public API functions

Browse Source 
Use lower case for the function name as that's cmake style.

Change-Id: I6c53166aa3a8cece4abe8a485e06bd359fc12a06
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
This commit is contained in:
Simon Hausmann 2019-09-19 08:45:21 +02:00
parent ceb2937498
commit f4aa7255e6
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/corelib/Qt6CoreMacros.cmake
View File

@ -39,7 +39,7 @@
include(CMakeParseArguments) include(CMakeParseArguments)
# macro used to create the names of output files preserving relative dirs # macro used to create the names of output files preserving relative dirs
macro(QT6_MAKE_OUTPUT_FILE infile prefix ext outfile ) macro(qt6_make_output_file infile prefix ext outfile )
string(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength) string(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength)
string(LENGTH ${infile} _infileLength) string(LENGTH ${infile} _infileLength)
set(_checkinfile ${CMAKE_CURRENT_SOURCE_DIR}) set(_checkinfile ${CMAKE_CURRENT_SOURCE_DIR})
@ -65,7 +65,7 @@ macro(QT6_MAKE_OUTPUT_FILE infile prefix ext outfile )
endmacro() endmacro()
macro(QT6_GET_MOC_FLAGS _moc_flags) macro(qt6_get_moc_flags _moc_flags)
set(${_moc_flags}) set(${_moc_flags})
get_directory_property(_inc_DIRS INCLUDE_DIRECTORIES) get_directory_property(_inc_DIRS INCLUDE_DIRECTORIES)
@ -97,7 +97,7 @@ endmacro()
# helper macro to set up a moc rule # helper macro to set up a moc rule
function(QT6_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target moc_depends) function(qt6_create_moc_command infile outfile moc_flags moc_options moc_target moc_depends)
# Pass the parameters in a file. Set the working directory to # Pass the parameters in a file. Set the working directory to
# be that containing the parameters file and reference it by # be that containing the parameters file and reference it by
# just the file name. This is necessary because the moc tool on # just the file name. This is necessary because the moc tool on
@ -143,7 +143,7 @@ function(QT6_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
endfunction() endfunction()
function(QT6_GENERATE_MOC infile outfile ) function(qt6_generate_moc infile outfile )
# get include dirs and flags # get include dirs and flags
qt6_get_moc_flags(moc_flags) qt6_get_moc_flags(moc_flags)
get_filename_component(abs_infile ${infile} ABSOLUTE) get_filename_component(abs_infile ${infile} ABSOLUTE)
@ -160,7 +160,7 @@ endfunction()
# qt6_wrap_cpp(outfiles inputfile ... ) # qt6_wrap_cpp(outfiles inputfile ... )
function(QT6_WRAP_CPP outfiles ) function(qt6_wrap_cpp outfiles )
# get include dirs # get include dirs
qt6_get_moc_flags(moc_flags) qt6_get_moc_flags(moc_flags)
@ -189,7 +189,7 @@ endfunction()
# _qt6_parse_qrc_file(infile _out_depends _rc_depends) # _qt6_parse_qrc_file(infile _out_depends _rc_depends)
# internal # internal
function(_QT6_PARSE_QRC_FILE infile _out_depends _rc_depends) function(_qt6_parse_qrc_file infile _out_depends _rc_depends)
get_filename_component(rc_path ${infile} PATH) get_filename_component(rc_path ${infile} PATH)
if(EXISTS "${infile}") if(EXISTS "${infile}")
@ -222,7 +222,7 @@ endfunction()
# qt6_add_binary_resources(target inputfiles ... ) # qt6_add_binary_resources(target inputfiles ... )
function(QT6_ADD_BINARY_RESOURCES target ) function(qt6_add_binary_resources target )
set(options) set(options)
set(oneValueArgs DESTINATION) set(oneValueArgs DESTINATION)
@ -241,7 +241,7 @@ function(QT6_ADD_BINARY_RESOURCES target )
foreach(it ${rcc_files}) foreach(it ${rcc_files})
get_filename_component(infile ${it} ABSOLUTE) get_filename_component(infile ${it} ABSOLUTE)
_QT6_PARSE_QRC_FILE(${infile} _out_depends _rc_depends) _qt6_parse_qrc_file(${infile} _out_depends _rc_depends)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON) set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
set(infiles ${infiles} ${infile}) set(infiles ${infiles} ${infile})
set(out_depends ${out_depends} ${_out_depends}) set(out_depends ${out_depends} ${_out_depends})
@ -260,10 +260,10 @@ endfunction()
# or # or
# qt6_add_resources(outfiles inputfile ... ) # qt6_add_resources(outfiles inputfile ... )
function(QT6_ADD_RESOURCES outfiles ) function(qt6_add_resources outfiles )
if (TARGET ${outfiles}) if (TARGET ${outfiles})
cmake_parse_arguments(arg "" "OUTPUT_TARGETS" "" ${ARGN}) cmake_parse_arguments(arg "" "OUTPUT_TARGETS" "" ${ARGN})
QT6_PROCESS_RESOURCE(${ARGV}) qt6_process_resource(${ARGV})
if (arg_OUTPUT_TARGETS) if (arg_OUTPUT_TARGETS)
set(${arg_OUTPUT_TARGETS} ${${arg_OUTPUT_TARGETS}} PARENT_SCOPE) set(${arg_OUTPUT_TARGETS} ${${arg_OUTPUT_TARGETS}} PARENT_SCOPE)
endif() endif()
@ -286,7 +286,7 @@ function(QT6_ADD_RESOURCES outfiles )
get_filename_component(infile ${it} ABSOLUTE) get_filename_component(infile ${it} ABSOLUTE)
set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp) set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp)
_QT6_PARSE_QRC_FILE(${infile} _out_depends _rc_depends) _qt6_parse_qrc_file(${infile} _out_depends _rc_depends)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON) set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
add_custom_command(OUTPUT ${outfile} add_custom_command(OUTPUT ${outfile}
@ -304,7 +304,7 @@ endfunction()
# qt6_add_big_resources(outfiles inputfile ... ) # qt6_add_big_resources(outfiles inputfile ... )
function(QT6_ADD_BIG_RESOURCES outfiles ) function(qt6_add_big_resources outfiles )
if (CMAKE_VERSION VERSION_LESS 3.9) if (CMAKE_VERSION VERSION_LESS 3.9)
message(FATAL_ERROR, "qt6_add_big_resources requires CMake 3.9 or newer") message(FATAL_ERROR, "qt6_add_big_resources requires CMake 3.9 or newer")
endif() endif()
@ -328,7 +328,7 @@ function(QT6_ADD_BIG_RESOURCES outfiles )
set(tmpoutfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}tmp.cpp) set(tmpoutfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}tmp.cpp)
set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.o) set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.o)
_QT6_PARSE_QRC_FILE(${infile} _out_depends _rc_depends) _qt6_parse_qrc_file(${infile} _out_depends _rc_depends)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON) set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON)
add_custom_command(OUTPUT ${tmpoutfile} add_custom_command(OUTPUT ${tmpoutfile}
COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc ${rcc_options} --name ${outfilename} --pass 1 --output ${tmpoutfile} ${infile} COMMAND ${QT_CMAKE_EXPORT_NAMESPACE}::rcc ${rcc_options} --name ${outfilename} --pass 1 --output ${tmpoutfile} ${infile}

2
util/cmake/pro2cmake.py
View File

@ -353,7 +353,7 @@ def write_add_qt_resource_call(
params += f'{spaces(1)}BASE\n{spaces(2)}"{base_dir}"\n' params += f'{spaces(1)}BASE\n{spaces(2)}"{base_dir}"\n'
add_resource_command = "" add_resource_command = ""
if is_example: if is_example:
add_resource_command = "QT6_ADD_RESOURCES" add_resource_command = "qt6_add_resources"
else: else:
add_resource_command = "add_qt_resource" add_resource_command = "add_qt_resource"
output += ( output += (