From a134cb1855622694355d8564b2f6aa0b7bf08b29 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 22 Nov 2017 14:19:24 +0100 Subject: windeployqt: winrt: Do not list translation files that are not deployed Visual Studio projects for winrt usage rely on a proper list of files that are deployed. We concat translation files into a single qt_.qm file using lconvert, but also mention every "sub file" (qtbase_.qm etc) in json. That breaks deployment on winrt and thus should not be done on that platform. Change-Id: I3086b923ce4703ec159202cfe8df9447cdd51571 Reviewed-by: Friedemann Kleint --- src/windeployqt/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index fd21a6949..a7008acb8 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -985,7 +985,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); } -- cgit v1.2.1