Remove CMake compatibility functions for old API
All repositories define QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS by now, and we can remove QtCompatibilityHelpers.cmake altogether. Change-Id: I4d8104246e96a4514d5651c104607d651d208d95 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
f03e9164c0
commit
6d82d0c532
@ -43,9 +43,6 @@ project(QtBase
|
||||
LANGUAGES CXX C ASM
|
||||
)
|
||||
|
||||
# Make sure we only use latest private CMake API, aka no compatibility wrappers.
|
||||
set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE)
|
||||
|
||||
# Make sure we use the fixed BASE argument of qt_add_resource.
|
||||
set(QT_USE_FIXED_QT_ADD_RESOURCE_BASE TRUE)
|
||||
|
||||
|
@ -173,7 +173,6 @@ qt_copy_or_install(FILES
|
||||
cmake/QtBuildInformation.cmake
|
||||
cmake/QtCMakeHelpers.cmake
|
||||
cmake/QtCMakeVersionHelpers.cmake
|
||||
cmake/QtCompatibilityHelpers.cmake
|
||||
cmake/QtCompilerFlags.cmake
|
||||
cmake/QtCompilerOptimization.cmake
|
||||
cmake/QtConfigDependencies.cmake.in
|
||||
|
@ -512,7 +512,6 @@ include(Qt3rdPartyLibraryHelpers)
|
||||
include(QtAppHelpers)
|
||||
include(QtAutogenHelpers)
|
||||
include(QtCMakeHelpers)
|
||||
include(QtCompatibilityHelpers)
|
||||
include(QtDeferredDependenciesHelpers)
|
||||
include(QtDbusHelpers)
|
||||
include(QtDocsHelpers)
|
||||
|
@ -1,112 +0,0 @@
|
||||
if(NOT QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS)
|
||||
# Compatibility functions that should be removed once all their usages are removed.
|
||||
function(extend_target)
|
||||
qt_extend_target(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(add_qt_module)
|
||||
qt_add_module(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(add_qt_plugin)
|
||||
qt_add_plugin(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(add_qt_tool)
|
||||
qt_add_tool(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(add_qt_test)
|
||||
qt_add_test(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(add_qt_test_helper)
|
||||
qt_add_test_helper(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(add_qt_manual_test)
|
||||
qt_add_manual_test(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(add_qt_benchmark)
|
||||
qt_add_benchmark(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(add_qt_executable)
|
||||
qt_add_executable(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(add_qt_simd_part)
|
||||
qt_add_simd_part(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(add_qt_docs)
|
||||
qt_add_docs(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(add_qt_resource)
|
||||
qt_add_resource(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(add_cmake_library)
|
||||
qt_add_cmake_library(${ARGV})
|
||||
endfunction()
|
||||
|
||||
|
||||
# New compatibility functions that should be removed before release.
|
||||
function(qt_extend_target)
|
||||
qt_internal_extend_target(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(qt_add_module)
|
||||
qt_internal_add_module(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(qt_add_tool)
|
||||
qt_internal_add_tool(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(qt_add_test)
|
||||
qt_internal_add_test(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(qt_add_test_helper)
|
||||
qt_internal_add_test_helper(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(qt_add_manual_test)
|
||||
qt_internal_add_manual_test(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(qt_add_benchmark)
|
||||
qt_internal_add_benchmark(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(qt_add_executable)
|
||||
qt_internal_add_executable(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(qt_add_simd_part)
|
||||
qt_internal_add_simd_part(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(qt_add_docs)
|
||||
qt_internal_add_docs(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(qt_add_resource)
|
||||
qt_internal_add_resource(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(qt_add_cmake_library)
|
||||
qt_internal_add_cmake_library(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(qt_add_3rdparty_library)
|
||||
qt_internal_add_3rdparty_library(${ARGV})
|
||||
endfunction()
|
||||
|
||||
function(qt_create_tracepoints)
|
||||
qt_internal_create_tracepoints(${ARGV})
|
||||
endfunction()
|
||||
endif()
|
@ -10,9 +10,6 @@ project(QtMockPlugins
|
||||
LANGUAGES CXX C
|
||||
)
|
||||
|
||||
# Make sure we only use latest private CMake API, aka no compatibility wrappers.
|
||||
set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE)
|
||||
|
||||
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
|
||||
find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui Widgets Xml)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user