diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-15 17:09:29 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-16 13:53:04 +0200 |
commit | c6b3680bcf433bc82219e787b80a2f3430706def (patch) | |
tree | 541beaa15b2552c5a92ee298f1f85922f919ad93 /src/corelib/Qt6CoreMacros.cmake | |
parent | ff33883fead48137d1a9b5de5d33d8b15a585811 (diff) |
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 <joerg.bornemann@qt.io>
Diffstat (limited to 'src/corelib/Qt6CoreMacros.cmake')
-rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 9a9592f90f..a3fa9d3656 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() |