mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Fix creating the list of Qt translation files under Qt5
We were apparently exploiting a bug in qmake for Qt 4. The $$join function in Qt 5 is fixed: it returns a single string, not a list with multiple elements. Instead, we just iterate over the element list. Signed-off-by: Thiago Macieira <thiago@macieira.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
1f785111f7
commit
b08b9183bc
1 changed files with 6 additions and 2 deletions
|
@ -2,13 +2,17 @@ marbledir.files = $$MARBLEDIR
|
|||
doc.files = $$DOC_FILES
|
||||
translation.files = $$replace(TRANSLATIONS, .ts, .qm)
|
||||
exists($$[QT_INSTALL_TRANSLATIONS]) {
|
||||
qt_translation_dir = $$[QT_INSTALL_TRANSLATIONS]/
|
||||
qt_translation_dir = $$[QT_INSTALL_TRANSLATIONS]
|
||||
} else: exists(/usr/share/qt4/translations) {
|
||||
# On some cross-compilation environments, the translations are either missing or not
|
||||
# where they're expected to be. In such cases, try copying from the system.
|
||||
qt_translation_dir = /usr/share/qt4/translations
|
||||
}
|
||||
qttranslation.files = $$join(QTTRANSLATIONS," "$$qt_translation_dir/,$$qt_translation_dir/)
|
||||
|
||||
# Prepend the Qt translation dir so we can actually find the files
|
||||
qttranslation.files =
|
||||
for(translation, QTTRANSLATIONS): \
|
||||
qttranslation.files += $${qt_translation_dir}/$$translation
|
||||
|
||||
nltab = $$escape_expand(\\n\\t)
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue