diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-05-06 16:38:53 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-05-11 14:35:30 +0200 |
| commit | 3a62f9e0c98d1cc311846394b744c8553ea9739c (patch) | |
| tree | d5f7fc97a08f80ae5228992d94a6b0ed0aeb5a2d /src | |
| parent | 22a992cb12949bb15eec03f524ce97100c78bd0c (diff) | |
CMake: Resurrect test_import_plugins cmake build tests
Now that we run tests for static Qt builds in the CI, it makes sense
to restore the CMake build tests that check that static plugin
importing works correctly.
Resurrect the previously commented out test_import_plugins project and
port the mockplugins qmake projects to CMake.
mockplugins is a CMake project that uses the internal Qt CMake API to
build and install some Qt modules and plugins.
test_import_plugins depends on that test (via a CMake fixture) to
build public projects that use those plugins.
The installation of the mockplugins modules pollutes the Qt install
prefix, but in the CI that only happens on the test VM, which means
the release packages are not affected.
Locally on a developer machine the Qt install path will be polluted,
but it's not that much of a big deal. We could try and address that in
a future change by using the QT_ADDITIONAL_PACKAGES_PREFIX_PATH
functionality added for Conan to allow the installation of Qt packages
into a non-standard prefix.
Task-number: QTBUG-87580
Task-number: QTBUG-92933
Change-Id: I0841064a60a5ffba5118640d3197527a38ba6c30
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/Qt6CoreMacros.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 804718df86..6d477180a0 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -803,10 +803,13 @@ function(qt6_import_plugins target) # Check if passed plugin target name is a version-less one, and make a version-full # one. + set_property(TARGET "${target}" APPEND PROPERTY "QT_PLUGINS_${_current_type}" "${_arg}") _qt_get_plugin_name_with_version("${_arg}" qt_plugin_with_version) - if(TARGET "${_arg}" OR TARGET "${qt_plugin_with_version}") - set_property(TARGET "${target}" APPEND PROPERTY "QT_PLUGINS_${_current_type}" "${_arg}") - else() + + # TODO: Do we really need this check? We didn't have it in Qt5, and plugin targets + # wrapped in genexes end up causing warnings, but we explicitly use GENEX_EVAL to + # support them. + if(NOT TARGET "${_arg}" AND NOT TARGET "${qt_plugin_with_version}") message("Warning: plug-in ${_arg} is not known to the current Qt installation.") endif() endif() |