diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2014-01-21 14:55:21 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-01-22 07:59:19 -0800 |
| commit | b08b9183bc89605ff416dc31e66e51d6b81ac56d (patch) | |
| tree | ca08a7d0bef2b530e6a2b98c060fb46b0721ed37 /subsurface-install.pri | |
| parent | 1f785111f7308850db5ee037b73f761bbfb5f0d1 (diff) | |
| download | subsurface-b08b9183bc89605ff416dc31e66e51d6b81ac56d.tar.gz | |
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>
Diffstat (limited to 'subsurface-install.pri')
| -rw-r--r-- | subsurface-install.pri | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/subsurface-install.pri b/subsurface-install.pri index 0a379ab56..47c459a8a 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -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) |