summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Wolff <oliver.wolff@qt.io>2017-11-22 14:19:24 +0100
committerLars Knoll <lars.knoll@qt.io>2017-11-28 11:32:39 +0000
commit3ce89dc37d3c73033c18dcec9e4710afd747ce01 (patch)
tree8369655888335841c0b3285b49ce20357d2c1805
parent790d6c45153b84336b68cfa1344d5734425eb2c5 (diff)
windeployqt: winrt: Do not list translation files that are not deployedv5.10.0-rc3v5.10.0-rc2v5.10.0
Visual Studio projects for winrt usage rely on a proper list of files that are deployed. We concat translation files into a single qt_<prefix>.qm file using lconvert, but also mention every "sub file" (qtbase_<prefix>.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 <Friedemann.Kleint@qt.io> (cherry picked from commit a134cb1855622694355d8564b2f6aa0b7bf08b29) Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--src/windeployqt/main.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index f574bd25e..07554e222 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);
}