CMakeLists: Fix QT_TRANSLATION_FILE path for Qt 6
#11880
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fwcd
commented
Aug 28, 2023
| @@ -2646,7 +2646,7 @@ if(APPLE OR WIN32) | |||
| # qt_de.qm is just one arbitrary file in the directory that needs to be located; | |||
| # there is no particular reason to look for this file versus any other one in the directory. | |||
| if(QT6) | |||
| find_file(QT_TRANSLATION_FILE qt_de.qm PATHS "${Qt6_DIR}/../../../translations" "${Qt6_DIR}/../../qt5/translations" REQUIRED NO_DEFAULT_PATH) | |||
There was a problem hiding this comment.
Side note: QT_DIR seems to work too, as well as simply passing /translations/Qt6 (which seems to be implicity resolved against CMAKE_PREFIX_PATH, i.e. the vcpkg install root, even if NO_DEFAULT_PATH is passed?!).
For consistency I went with Qt6_DIR though.
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes the (currently broken) Qt 6 configure for me. It is effectively an adaptation of 06aec1d from the
qt6_switchbranch, which, however, still uses theQt5_DIRvariable instead ofQt6_DIR(not sure why that worked in the first place).cc @daschuer