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

CMake: Fix qt_add_plugin to be a proper public API function

Browse Source 
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 <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-10-15 17:09:29 +02:00
parent ff33883fea
commit c6b3680bcf
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/Qt6CoreMacros.cmake
View File

@ -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()