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

 Conflicts:
	.qmake.conf

Change-Id: Ieef1b05234ee67bef28f2dc9abaa65f10840d21b

1 files changed, 2 insertions, 1 deletions

diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index 9b68df94f..1be7338e4 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -986,7 +986,8 @@ static bool deployTranslations(const QString &sourcePath, quint64 usedQtModules,
         arguments.append(QDir::toNativeSeparators(targetFilePath));
         const QFileInfoList &langQmFiles = sourceDir.entryInfoList(translationNameFilters(usedQtModules, prefix));
         for (const QFileInfo &langQmFileFi : langQmFiles) {
-            if (options.json) {
+            // winrt relies on a proper list of deployed files. We cannot cheat an mention files we do not ship here.
+            if (options.json && !options.isWinRt()) {
                 options.json->addFile(langQmFileFi.absoluteFilePath(),
                                       absoluteTarget);
             }