Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	src/qtattributionsscanner/main.cpp

Change-Id: Idb919f217f1dea42728fd9318fd9f48d9c3d3f29

1 files changed, 2 insertions, 2 deletions

diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index 3ca83ca44..f574bd25e 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -982,13 +982,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());
         }