diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-03-20 14:27:02 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2024-03-21 06:47:10 +0100 |
| commit | 5c3800b7ff94b36b2ca13fc23acfd9209ea4c50b (patch) | |
| tree | 146f833abd21112825dd72e92fcbec12fb094ec3 /src/qdoc/qdoc/src/qdoc/cppcodemarker.cpp | |
| parent | db5038b8a5a1c1904d8f7609dd583319184fc266 (diff) | |
CMake: Fix discrepancy in qt_add_translations .qm output paths
When calling qt_add_translations with automatic target collection we
1. Predict .qm file paths to be in CMAKE_CURRENT_BINARY_DIR and return
the paths in QM_FILES_OUTPUT_VARIABLE.
2. Defer the call of qt_add_translations to the end of the PROJECT_DIR
scope.
3. When running the deferred call, generate .qm files in
CMAKE_CURRENT_BINARY_DIR.
The values of CMAKE_CURRENT_BINARY_DIR in steps 1 and 3 are different if
the call to qt_add_translations is in a subdirectory.
Fix this by passing the .qm output directory to the deferred call of
qt_add_translations and qt_add_lrelease.
Pick-to: 6.7 6.7.0
Fixes: QTBUG-123405
Change-Id: If4a9cdc03ed4659f28ff70c7662f1125a1f59b55
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/qdoc/qdoc/src/qdoc/cppcodemarker.cpp')
0 files changed, 0 insertions, 0 deletions