From 54ee6e00f56e94046b5db5f7c3b904130adc5277 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 13 Oct 2017 16:10:39 +0200 Subject: windeployqt: Print list of translations Pass the options struct to deployTranslations() and add the files to JsonOutput. Task-number: QTBUG-63744 Change-Id: Ie1d8587cbeb22acc2fdcfba6e666059e3936c708 Reviewed-by: Oliver Wolff --- src/windeployqt/main.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index 5f6340d3b..3c4cc090d 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -952,7 +952,8 @@ static QStringList translationNameFilters(quint64 modules, const QString &prefix } static bool deployTranslations(const QString &sourcePath, quint64 usedQtModules, - const QString &target, unsigned flags, QString *errorMessage) + const QString &target, const Options &options, + QString *errorMessage) { // Find available languages prefixes by checking on qtbase. QStringList prefixes; @@ -978,14 +979,22 @@ static bool deployTranslations(const QString &sourcePath, quint64 usedQtModules, arguments.clear(); const QString targetFile = QStringLiteral("qt_") + prefix + QStringLiteral(".qm"); arguments.append(QStringLiteral("-o")); - arguments.append(QDir::toNativeSeparators(absoluteTarget + QLatin1Char('/') + targetFile)); + const QString targetFilePath = absoluteTarget + QLatin1Char('/') + targetFile; + if (options.json) + options.json->addFile(sourcePath + QLatin1Char('/') + targetFile, targetFilePath); + arguments.append(QDir::toNativeSeparators(targetFilePath)); const QFileInfoList &langQmFiles = sourceDir.entryInfoList(translationNameFilters(usedQtModules, prefix)); - for (const QFileInfo &langQmFileFi : langQmFiles) + for (const QFileInfo &langQmFileFi : langQmFiles) { + if (options.json) { + options.json->addFile(langQmFileFi.absoluteFilePath(), + absoluteTarget + QLatin1Char('/') + langQmFileFi.fileName()); + } arguments.append(langQmFileFi.fileName()); + } if (optVerboseLevel) std::wcout << "Creating " << targetFile << "...\n"; unsigned long exitCode; - if (!(flags & SkipUpdateFile) + if ((options.updateFileFlags & SkipUpdateFile) == 0 && (!runProcess(binary, arguments, sourcePath, &exitCode, 0, 0, errorMessage) || exitCode)) { return false; } @@ -1524,7 +1533,7 @@ static DeployResult deploy(const Options &options, return result; if (!deployTranslations(qmakeVariables.value(QStringLiteral("QT_INSTALL_TRANSLATIONS")), result.deployedQtLibraries, options.translationsDirectory, - options.updateFileFlags, errorMessage)) { + options, errorMessage)) { return result; } } -- cgit v1.2.1