summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2017-11-06 12:28:00 +0100
committerOliver Wolff <oliver.wolff@qt.io>2017-11-06 11:47:44 +0000
commit9df140339230d92690758ebc3e3b6cc6c1a5e8e3 (patch)
treefea5dd2536c6c311c4848fa72eca55ea0ef0fc42
parentd683861584a38a1d1b855bde25412c06c878a1c1 (diff)
downloadqttools-9df140339230d92690758ebc3e3b6cc6c1a5e8e3.tar.gz
windeployqt: Do not set translations' file name as target directory
The target part of a json entry has to be a directory and not the final file name. Change-Id: I61c5649c61a3f539f58af7b636fc0ca1acb94c77 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r--src/windeployqt/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index 3c4cc090d..fd21a6949 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -981,13 +981,13 @@ static bool deployTranslations(const QString &sourcePath, quint64 usedQtModules,
arguments.append(QStringLiteral("-o"));
const QString targetFilePath = absoluteTarget + QLatin1Char('/') + targetFile;
if (options.json)
- options.json->addFile(sourcePath + QLatin1Char('/') + targetFile, targetFilePath);
+ options.json->addFile(sourcePath + QLatin1Char('/') + targetFile, absoluteTarget);
arguments.append(QDir::toNativeSeparators(targetFilePath));
const QFileInfoList &langQmFiles = sourceDir.entryInfoList(translationNameFilters(usedQtModules, prefix));
for (const QFileInfo &langQmFileFi : langQmFiles) {
if (options.json) {
options.json->addFile(langQmFileFi.absoluteFilePath(),
- absoluteTarget + QLatin1Char('/') + langQmFileFi.fileName());
+ absoluteTarget);
}
arguments.append(langQmFileFi.fileName());
}