[PATCH] Fix creating the list of Qt translation files under Qt5

Thiago Macieira thiago at macieira.org
Tue Jan 21 14:55:21 UTC 2014


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 at macieira.org>
---
 subsurface-install.pri | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/subsurface-install.pri b/subsurface-install.pri
index 0a379ab..47c459a 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)
 
-- 
1.7.11.7



More information about the subsurface mailing list