diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-05-18 12:39:16 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-06-04 14:27:20 +0200 |
commit | 6d82d0c53272ec51465fec3dee71db02cf147a94 (patch) | |
tree | fc18d188741dbf5e7342c803529ff8f3e98978ce /cmake | |
parent | f03e9164c010cfaf125db4fd0c9792e793715298 (diff) |
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>
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/QtBaseGlobalTargets.cmake | 1 | ||||
-rw-r--r-- | cmake/QtBuild.cmake | 1 | ||||
-rw-r--r-- | cmake/QtCompatibilityHelpers.cmake | 112 |
3 files changed, 0 insertions, 114 deletions
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake index bfe52ca6d7..17d5cd6c05 100644 --- a/cmake/QtBaseGlobalTargets.cmake +++ b/cmake/QtBaseGlobalTargets.cmake @@ -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 diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 49c874575c..bb8b14658a 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -512,7 +512,6 @@ include(Qt3rdPartyLibraryHelpers) include(QtAppHelpers) include(QtAutogenHelpers) include(QtCMakeHelpers) -include(QtCompatibilityHelpers) include(QtDeferredDependenciesHelpers) include(QtDbusHelpers) include(QtDocsHelpers) diff --git a/cmake/QtCompatibilityHelpers.cmake b/cmake/QtCompatibilityHelpers.cmake deleted file mode 100644 index 89e23f498f..0000000000 --- a/cmake/QtCompatibilityHelpers.cmake +++ /dev/null @@ -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() |