From 148e6bb3cc2dbb566f4924419c31877cad532fd0 Mon Sep 17 00:00:00 2001 From: Taras Kushnir Date: Sun, 5 Nov 2017 17:35:54 +0200 Subject: [PATCH] Workaround for FHS mode for translations --- tools/linuxdeployqt/shared.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/linuxdeployqt/shared.cpp b/tools/linuxdeployqt/shared.cpp index 5a0e03d..651a59e 100644 --- a/tools/linuxdeployqt/shared.cpp +++ b/tools/linuxdeployqt/shared.cpp @@ -1609,9 +1609,18 @@ void deployTranslations(const QString &appDirPath, quint64 usedQtModules) return; } - QString translationsDirPath = appDirPath + QStringLiteral("/translations"); - LogDebug() << "Using" << translationsDirPath << "as translations directory for App"; - LogDebug() << "Using" << qtTranslationsPath << " to search for Qt translations"; + QString translationsDirPath; + if (!fhsLikeMode) { + translationsDirPath = appDirPath + QStringLiteral("/translations"); + } else { + // TODO: refactor this global variables hack + QFileInfo appBinaryFI(appBinaryPath); + QString appRoot = appBinaryFI.absoluteDir().absolutePath() + "/../"; + translationsDirPath = appRoot + QStringLiteral("/translations"); + } + + LogNormal() << "Using" << translationsDirPath << "as translations directory for App"; + LogNormal() << "Using" << qtTranslationsPath << " to search for Qt translations"; QFileInfo fi(translationsDirPath); if (!fi.isDir()) {