diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-03-23 15:48:56 +1100 |
|---|---|---|
| committer | Craig Scott <craig.scott@qt.io> | 2021-03-29 18:10:22 +1100 |
| commit | aa4a1006cbccbc180c600f9b4dc9e882bb5ed5ca (patch) | |
| tree | 93a1b56b677e453d52f5bf5ff991fb423ee0b8b7 /cmake/QtModuleHelpers.cmake | |
| parent | 2801c1988742b18557c581a544a70a02f4faefa1 (diff) | |
Refactor qt_internal_add_plugin() and qt6_add_plugin()
Remove code duplication by calling qt6_add_plugin() from
qt_internal_add_plugin().
Separate out the public and internal arguments for the
variables defined in QtBuild.cmake for these functions.
Provide them via commands instead for greater robustness.
This separation allows other Qt repos to access the appropriate
set of keywords where they define commands that forward
on to *_add_plugin() in their implementations. Retain
the old variables for now to simplify the integration
steps for updating other repos. The old variables can
be removed once there are no more references left to
them in any repo.
Task-number: QTBUG-88763
Pick-to: 6.1
Change-Id: I0105523afd95995923bd20fc963d245bbb15d34d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtModuleHelpers.cmake')
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 1fa17b8afd..4a3237d4ea 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -166,7 +166,7 @@ function(qt_internal_add_module target) ) endif() - qt_internal_apply_win_prefix_and_suffix("${target}") + _qt_internal_apply_win_prefix_and_suffix("${target}") if (WIN32 AND BUILD_SHARED_LIBS) _qt_internal_generate_win32_rc_file(${target}) |