diff options
| author | Craig Scott <craig.scott@qt.io> | 2021-08-31 17:33:34 +1000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-06 09:27:52 +0000 |
| commit | 69db9a39cc37b7ee8e533e9db550aae8e6297001 (patch) | |
| tree | 9b211251292ec9b892786f9003ad244524b739e2 | |
| parent | 1466519925b8074805b0a90e56e715f0ab0adb4c (diff) | |
Revert "Ensure versionless wrappers do not introduce a new variable scope"
This reverts commit bda9db56895a8d707638e7e2e4b06c96f59b99c2.
Macros add another level of escaping that functions do not. The
conversion of the versionless wrappers to macros may alter the
behavior, so revert that change.
Task-number: QTBUG-96219
Change-Id: I89aea5e11fab8634d942ac5957936a7bce9e5ade
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 2060b2b1da6d500685470e79458ac1117c920d97)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/linguist/Qt6LinguistToolsMacros.cmake | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/linguist/Qt6LinguistToolsMacros.cmake b/src/linguist/Qt6LinguistToolsMacros.cmake index 97230b1be..452e3f503 100644 --- a/src/linguist/Qt6LinguistToolsMacros.cmake +++ b/src/linguist/Qt6LinguistToolsMacros.cmake @@ -321,37 +321,39 @@ function(qt6_add_translations target) endfunction() if(NOT QT_NO_CREATE_VERSIONLESS_FUNCTIONS) - macro(qt_create_translation) + function(qt_create_translation _qm_files) if(QT_DEFAULT_MAJOR_VERSION EQUAL 5) - qt5_create_translation(${ARGV}) + qt5_create_translation("${_qm_files}" ${ARGN}) elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6) - qt6_create_translation(${ARGV}) + qt6_create_translation("${_qm_files}" ${ARGN}) endif() - endmacro() - macro(qt_add_translation) + set("${_qm_files}" "${${_qm_files}}" PARENT_SCOPE) + endfunction() + function(qt_add_translation _qm_files) if(QT_DEFAULT_MAJOR_VERSION EQUAL 5) - qt5_add_translation(${ARGV}) + qt5_add_translation("${_qm_files}" ${ARGN}) elseif(QT_DEFAULT_MAJOR_VERSION EQUAL 6) - qt6_add_translation(${ARGV}) + qt6_add_translation("${_qm_files}" ${ARGN}) endif() - endmacro() - macro(qt_add_lupdate) + set("${_qm_files}" "${${_qm_files}}" PARENT_SCOPE) + endfunction() + function(qt_add_lupdate) if(QT_DEFAULT_MAJOR_VERSION EQUAL 6) - qt6_add_lupdate(${ARGV}) + qt6_add_lupdate(${ARGN}) else() message(FATAL_ERROR "qt_add_lupdate() is only available in Qt 6.") endif() - endmacro() + endfunction() macro(qt_add_lrelease) if(QT_DEFAULT_MAJOR_VERSION EQUAL 6) - qt6_add_lrelease(${ARGV}) + qt6_add_lrelease(${ARGN}) else() message(FATAL_ERROR "qt_add_lrelease() is only available in Qt 6.") endif() endmacro() macro(qt_add_translations) if(QT_DEFAULT_MAJOR_VERSION EQUAL 6) - qt6_add_translations(${ARGV}) + qt6_add_translations(${ARGN}) else() message(FATAL_ERROR "qt_add_translations() is only available in Qt 6.") endif() |