From c6b3680bcf433bc82219e787b80a2f3430706def Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 15 Oct 2020 17:09:29 +0200 Subject: [PATCH] CMake: Fix qt_add_plugin to be a proper public API function When configuring an example like widgets/tools/plugandpaint/plugins/basictools outside of a Qt build, the configuration fails because it tries to call the internal function instead of the public one. This was needed some time ago to facilitate moving from qt_add_plugin to qt_internal_add_plugin, so some compatibility code was added. But we've now migrated to qt_internal_add_plugin across most repos, so we should remove the compatibility code to allow examples to configure successfully. Amends 6fbeef4c6b2323fc4b7856520c0f38f8139c9c54 Fixes: QTBUG-86858 Change-Id: Ib15f50351a8742c44d7a8be84be4e576cb48bddb Reviewed-by: Joerg Bornemann --- src/corelib/Qt6CoreMacros.cmake | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 9a9592f90fd..a3fa9d36562 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -1280,12 +1280,7 @@ endfunction() if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) function(qt_add_plugin) - if (NOT DEFINED QT_DISABLE_QT_ADD_PLUGIN_COMPATIBILITY - OR NOT QT_DISABLE_QT_ADD_PLUGIN_COMPATIBILITY) - qt_internal_add_plugin(${ARGV}) - else() - qt6_add_plugin(${ARGV}) - endif() + qt6_add_plugin(${ARGV}) endfunction() endif()