diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2017-11-22 14:19:24 +0100 |
---|---|---|
committer | Oliver Wolff <oliver.wolff@qt.io> | 2017-11-22 13:29:06 +0000 |
commit | a134cb1855622694355d8564b2f6aa0b7bf08b29 (patch) | |
tree | f4a1d80248d160d038867868a9f78397f82787ad | |
parent | 4c2cae795117897847c0ba0e9b9ff20fa6e4eda9 (diff) |
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_<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>
-rw-r--r-- | src/windeployqt/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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); } |